From 0a27e95632f1fe1358146668a20f89ba8cd22128 Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Fri, 14 Sep 2012 16:22:14 +0200 Subject: cesar/hal/phy: always bypass AES on MSE500, refs #3356 --- cesar/hal/phy/Config | 1 + cesar/hal/phy/src/pbdma.c | 6 ++++++ cesar/projects/plc/Config.mse500 | 6 ++++++ cleopatre/buildroot/package/plcdrv/plcdrv.mk | 7 +++++++ 4 files changed, 20 insertions(+) create mode 100644 cesar/projects/plc/Config.mse500 diff --git a/cesar/hal/phy/Config b/cesar/hal/phy/Config index 49bc14b8ed..e7747e9aa2 100644 --- a/cesar/hal/phy/Config +++ b/cesar/hal/phy/Config @@ -4,3 +4,4 @@ CONFIG_PHY_TRACE_DATE_WARNING = y CONFIG_PHY_CAP_MASK_DEFAULT = 7 CONFIG_PHY_ACCESS_WATCHDOG = y CONFIG_PHY_PLATFORM_DINI_PAMELA = n +CONFIG_PHY_AES_ALWAYS_BYPASSED = n diff --git a/cesar/hal/phy/src/pbdma.c b/cesar/hal/phy/src/pbdma.c index a19c38d3ea..93e0ce6350 100644 --- a/cesar/hal/phy/src/pbdma.c +++ b/cesar/hal/phy/src/pbdma.c @@ -16,6 +16,7 @@ #include "inc/regs.h" #include "hal/arch/arch.h" +#include "config/phy/aes.h" void ARCH_ILRAM phy_pbdma_start (phy_t *ctx, bool bypass_aes, @@ -29,6 +30,11 @@ phy_pbdma_start (phy_t *ctx, bool bypass_aes, && nb_total >= nb_pb_it); dbg_claim_ptr (first_pb); dbg_claim (ARCH_DMA_VALID (first_pb)); + +#if CONFIG_PHY_AES_ALWAYS_BYPASSED + bypass_aes = true; +#endif + if (first_chandata) { dbg_claim_ptr (first_chandata); diff --git a/cesar/projects/plc/Config.mse500 b/cesar/projects/plc/Config.mse500 new file mode 100644 index 0000000000..b597d75c11 --- /dev/null +++ b/cesar/projects/plc/Config.mse500 @@ -0,0 +1,6 @@ +CONFIG_DEBUG_CLAIM = n +CONFIG_GPIO_LED_TRAFFIC = y +CONFIG_BLK_SLACK = 512 +CONFIG_STATS_ON_FATAL = y +CONFIG_CP_AV = y +CONFIG_PHY_AES_ALWAYS_BYPASSED = y diff --git a/cleopatre/buildroot/package/plcdrv/plcdrv.mk b/cleopatre/buildroot/package/plcdrv/plcdrv.mk index 066f56613b..f8d3c8f1c1 100644 --- a/cleopatre/buildroot/package/plcdrv/plcdrv.mk +++ b/cleopatre/buildroot/package/plcdrv/plcdrv.mk @@ -52,7 +52,11 @@ ifeq ($(IS_PLCDRV_DEV),y) PLCROM_OBJPATH:=$(PLCROM_DEV_OBJPATH) PLCD_MAKE:=plcd-dev-make PLCDRV_MAKE:=plcdrv-dev-make +ifeq ($(BR2_TARGET_SPIDCOM_MSE500),y) + PLCROM_MAKE:=plcrom-dev-make-mse500 +else PLCROM_MAKE:=plcrom-dev-make +endif DEV_CLEAN:=plcd-dev-clean plcdrv-dev-clean plcrom-dev-clean else PLCDRV_SITE:=$(BASE_DIR)/../binaries @@ -73,6 +77,9 @@ plcdrv-dev-make: plcrom-dev-make: (cd $(PLCROM_DIR); $(MAKE)) +plcrom-dev-make-mse500: + (cd $(PLCROM_DIR); $(MAKE) PROJECT_CONFIG=Config.mse500) + plcd-dev-clean: -$(MAKE) -C $(PLCDRV_DIR) clean-plcd -- cgit v1.2.3