diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/thead/light-c910/Kconfig | 7 | ||||
| -rw-r--r-- | board/thead/light-c910/light.c | 4 | ||||
| -rw-r--r-- | board/thead/light-c910/sec_check.c | 2 | ||||
| -rw-r--r-- | board/thead/light-c910/sys_clk.c | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/board/thead/light-c910/Kconfig b/board/thead/light-c910/Kconfig index 7beb733b..8139eeed 100644 --- a/board/thead/light-c910/Kconfig +++ b/board/thead/light-c910/Kconfig @@ -48,6 +48,9 @@ config LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B config LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF bool "light ant ref security boot with verification" +config LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A + bool "light lpi4a security boot with verification" + config TARGET_LIGHT_FPGA_FM_C910 bool "light fullmask FPGA board" default n @@ -98,8 +101,8 @@ config SYS_TEXT_BASE config SPL_TEXT_BASE hex - default 0xffe0000800 if LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A || LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B || LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF - default 0xffe0000000 if !(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A || LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B || LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) + default 0xffe0000800 if LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A || LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B || LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF || LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A + default 0xffe0000000 if !(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A || LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B || LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF || LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) config SPL_MAX_SIZE hex diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c index ccdc912c..56e828b8 100644 --- a/board/thead/light-c910/light.c +++ b/board/thead/light-c910/light.c @@ -555,12 +555,14 @@ static void gmac_phy_rst(void) (void *)LIGHT_GPIO3_BADDR); writel(readl((void *)LIGHT_GPIO1_BADDR) & ~LIGHT_GPIO1_13, (void *)LIGHT_GPIO1_BADDR); + wmb(); /* At least 10ms */ - mdelay(12); + mdelay(50); writel(readl((void *)LIGHT_GPIO3_BADDR) | LIGHT_GPIO3_21, (void *)LIGHT_GPIO3_BADDR); writel(readl((void *)LIGHT_GPIO1_BADDR) | LIGHT_GPIO1_13, (void *)LIGHT_GPIO1_BADDR); + wmb(); } static void gmac_glue_init(uint64_t apb3s_baddr) diff --git a/board/thead/light-c910/sec_check.c b/board/thead/light-c910/sec_check.c index 5e388486..29a3ca56 100644 --- a/board/thead/light-c910/sec_check.c +++ b/board/thead/light-c910/sec_check.c @@ -180,7 +180,7 @@ err: return CMD_RET_FAILURE; } -#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) +#if CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_A) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_VAL_B) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_ANT_REF) || CONFIG_IS_ENABLED(LIGHT_SEC_BOOT_WITH_VERIFY_LPI4A) /* Secure function for image verificaiton here */ int get_image_version(unsigned long img_src_addr) { diff --git a/board/thead/light-c910/sys_clk.c b/board/thead/light-c910/sys_clk.c index 09c13477..c18fdb2c 100644 --- a/board/thead/light-c910/sys_clk.c +++ b/board/thead/light-c910/sys_clk.c @@ -290,7 +290,7 @@ void sys_clk_config(void) /* The boards other than the LightA board perform the bus down-speed operation */ -#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_BEAGLE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B) || defined (CONFIG_TARGET_LIGHT_FM_C910_LPI4A) +#if defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_DISCRETE) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_ANT_REF) || defined (CONFIG_TARGET_LIGHT_FM_C910_B_POWER) || defined (CONFIG_TARGET_LIGHT_FM_C910_VAL_B) /* axi_sram_clk: 812.8512MHz -> 688.128MHz */ tmp = readl((void *)LIGHT_AONCLK_ADDRBASE + 0x104); tmp |= 0x2000; |