December 2017 - U-Boot

[U-Boot] [v3] armv8: ls1012a: enable/disable eSDHC1 through hwconfig for new RDB
by Yangbo Lu 08 Dec '17

08 Dec '17

For LS1012ARDB RevD and later versions, the I2C reading for DIP switch setting had been no longer reliable since the board was reworked. This patch is to add hwconfig support to enable/disable eSDHC1 manually for these boards. Also let kernel decide status of esdhc0. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- Changes for v2: - Just used hwconfig() instead of getenv() and hwconfig_f(). Changes for v3: - only applied hwconfig support for RevD and later versions. --- board/freescale/ls1012ardb/ls1012ardb.c | 51 +++++++++++++++++++++------------ include/configs/ls1012ardb.h | 4 +++ 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index c6c1c71202..b73c7d6639 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -132,39 +132,52 @@ int board_init(void) int esdhc_status_fixup(void *blob, const char *compat) { - char esdhc0_path[] = "/soc/esdhc@1560000"; char esdhc1_path[] = "/soc/esdhc@1580000"; + u8 in1; u8 io = 0; u8 mux_sdhc2; - - do_fixup_by_path(blob, esdhc0_path, "status", "okay", - sizeof("okay"), 1); + bool sdhc2_en = false; i2c_set_bus_num(0); - /* - * The I2C IO-expander for mux select is used to control the muxing - * of various onboard interfaces. - * - * IO1[3:2] indicates SDHC2 interface demultiplexer select lines. - * 00 - SDIO wifi - * 01 - GPIO (to Arduino) - * 10 - eMMC Memory - * 11 - SPI - */ - if (i2c_read(I2C_MUX_IO1_ADDR, 0, 1, &io, 1) < 0) { + if (i2c_read(I2C_MUX_IO1_ADDR, 1, 1, &in1, 1) < 0) { printf("Error reading i2c boot information!\n"); - return 0; /* Don't want to hang() on this error */ + return 0; + } + + if ((in1 & (~__SW_REV_MASK)) <= __SW_REV_D) { + if (hwconfig("esdhc1")) + sdhc2_en = true; + } else { + /* + * The I2C IO-expander for mux select is used to control + * the muxing of various onboard interfaces. + * + * IO1[3:2] indicates SDHC2 interface demultiplexer + * select lines. + * 00 - SDIO wifi + * 01 - GPIO (to Arduino) + * 10 - eMMC Memory + * 11 - SPI + */ + if (i2c_read(I2C_MUX_IO1_ADDR, 0, 1, &io, 1) < 0) { + printf("Error reading i2c boot information!\n"); + return 0; /* Don't want to hang() on this error */ + } + + mux_sdhc2 = (io & 0x0c) >> 2; + /* Enable SDHC2 only when use SDIO wifi and eMMC */ + if (mux_sdhc2 == 2 || mux_sdhc2 == 0) + sdhc2_en = true; } - mux_sdhc2 = (io & 0x0c) >> 2; - /* Enable SDHC2 only when use SDIO wifi and eMMC */ - if (mux_sdhc2 == 2 || mux_sdhc2 == 0) + if (sdhc2_en) do_fixup_by_path(blob, esdhc1_path, "status", "okay", sizeof("okay"), 1); else do_fixup_by_path(blob, esdhc1_path, "status", "disabled", sizeof("disabled"), 1); + return 0; } diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 794117062f..d5384e6027 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -32,6 +32,10 @@ #define __SW_REV_MASK 0x07 #define __SW_REV_A 0xF8 #define __SW_REV_B 0xF0 +#define __SW_REV_C 0xE8 +#define __SW_REV_C1 0xE0 +#define __SW_REV_C2 0xD8 +#define __SW_REV_D 0xD0 /* MMC */ #ifdef CONFIG_MMC -- 2.14.1

3 4

[U-Boot] [PATCH] cmd: fastboot: Kconfig: solve config issue
by Patrick Delaunay 08 Dec '17

08 Dec '17

When FASTBOOT is activated, only one the supported device is supported in code at the same time - CONFIG_FASTBOOT_FLASH_MMC_DEV - CONFIG_FASTBOOT_FLASH_NAND_DEV But Today the choice is not exclusive in Kconfig and that cause Kconfig issue when : - CONFIG_FASTBOOT, CONFIG_MMC, CONFIG_NAND are activated - CONFIG_FASTBOOT_FLASH_MMC_DEV = 0 - CONFIG_FASTBOOT_FLASH_NAND_DEV is not activated The patch add a choice in Kconfig to select the FLASH provider - CONFIG_FASTBOOT_FLASH_MMC - CONFIG_FASTBOOT_FLASH_NAND Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- I execute buildman execute on board with CONFIG_FASTBOOT on label v2018.01-rc1 => no new error board list = A13-OLinuXino A20-OLinuXino-Lime2 A20-OLinuXino-Lime2-eMMC am335x_boneblack am335x_boneblack_vboot am335x_evm am335x_evm_norboot am335x_evm_nor am335x_evm_spiboot am335x_evm_usbspl am57xx_evm am57xx_evm_nodt am57xx_hs_evm bcm23550_w1d bcm28155_ap birdland_bav335a birdland_bav335b cgtqmx6eval CHIP CHIP_pro chromebit_mickey chromebook_jerry chromebook_minnie Cubietruck dra7xx_evm dra7xx_hs_evm evb-rk3036 evb-rk3229 evb-rk3288 evb-rk3328 evb-rv1108 fennec-rk3288 firefly-rk3288 kc1 kylin-rk3036 miqi-rk3288 mx6qsabrelite Nintendo_NES_Classic_Edition nitrogen6dl2g nitrogen6dl nitrogen6q2g nitrogen6q nitrogen6s1g nitrogen6s omap3_beagle omap3_logic parrot_r16 phycore-rk3288 popmetal-rk3288 rock2 Sinlinx_SinA33 sniper stih410-b2260 stm32mp15_basic stm32mp15_fpga_basic stm32mp15_fpga_trusted stm32mp15_trusted tinker-rk3288 xilinx_zynqmp_ep xilinx_zynqmp_zc1751_xm015_dc1 xilinx_zynqmp_zc1751_xm016_dc2 xilinx_zynqmp_zcu102_revA xilinx_zynqmp_zcu102_revB the modified configuration seems OK : $> tools/buildman/buildman -sdeSK A13-OLinuXino A20-OLinuXino-Lime2 A20-OLinuXino-Lime2-eMMC Cubietruck Sinlinx_SinA33 am57xx_evm am57xx_hs_evm chromebit_mickey chromebook_jerry chromebook_minnie dra7xx_evm dra7xx_hs_evm evb-rk3036 evb-rk3229 evb-rk3288 fennec-rk3288 firefly-rk3288 kc1 kylin-rk3036 miqi-rk3288 parrot_r16 phycore-rk3288 popmetal-rk3288 rock2 sniper tinker-rk3288 xilinx_zynqmp_ep xilinx_zynqmp_zc1751_xm015_dc1 xilinx_zynqmp_zcu102_revA xilinx_zynqmp_zcu102_revB : + u-boot.cfg: CONFIG_FASTBOOT_FLASH_MMC=1 + u-boot-spl.cfg: CONFIG_FASTBOOT_FLASH_MMC=1 + all: CONFIG_FASTBOOT_FLASH_MMC=1 CHIP_pro xilinx_zynqmp_zc1751_xm016_dc2 : + u-boot.cfg: CONFIG_FASTBOOT_FLASH_NAND=1 + u-boot-spl.cfg: CONFIG_FASTBOOT_FLASH_NAND=1 + all: CONFIG_FASTBOOT_FLASH_NAND=1 bcm23550_w1d bcm28155_ap evb-rk3328 evb-rv1108 stih410-b2260 : + u-boot.cfg: CONFIG_FASTBOOT_FLASH_MMC=1 + all: CONFIG_FASTBOOT_FLASH_MMC=1 and I test on my custom board (with MMC + NAND + FASTBOOT) the .config is now OK, MMC is selected by default and NAND_DEV is not requested cmd/fastboot/Kconfig | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig index 4ce7a77..aaf3d78 100644 --- a/cmd/fastboot/Kconfig +++ b/cmd/fastboot/Kconfig @@ -71,9 +71,23 @@ config FASTBOOT_FLASH the downloaded image to a non-volatile storage device. Define this to enable the "fastboot flash" command. +choice + prompt "Flash provider for FASTBOOT" + depends on FASTBOOT_FLASH + +config FASTBOOT_FLASH_MMC + bool "FASTBOOT on MMC" + depends on MMC + +config FASTBOOT_FLASH_NAND + bool "FASTBOOT on NAND" + depends on NAND + +endchoice + config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" - depends on FASTBOOT_FLASH && MMC + depends on FASTBOOT_FLASH_MMC default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help @@ -83,7 +97,7 @@ config FASTBOOT_FLASH_MMC_DEV config FASTBOOT_FLASH_NAND_DEV int "Define FASTBOOT NAND FLASH default device" - depends on FASTBOOT_FLASH && NAND + depends on FASTBOOT_FLASH_NAND depends on CMD_MTDPARTS default 0 if ARCH_SUNXI && NAND_SUNXI help -- 2.7.4

2 1

[U-Boot] [PATCH 0/3][v3] Update MAC address in "ethernet" node of Linux device tree
by Prabhakar Kushwaha 08 Dec '17

08 Dec '17

The MAC addresses get fixed in the device tree for "ethernet" nodes is by using trailing number behind "ethernet" found in "/aliases". It may not be necessary for the "ethernet" nodes to be sequential. There can be gaps in between or any ethenet node disabled. Reason for gaps is because the available ethernet port are based on SerDes protocol chosen for the SoC. Usually Linux device tree contains "ethernet" node for all possible ports supported by SoC for e.g. LS1046A. Where based on SerDes protocol some "ethernet" ports are unavailable hence non-sequential. This patch-set provide way to fetch MAC addr sequentially from env variables and also create hole in "ethernet" node (disable) based on SerDes protocol for LS1046ARDB. This patch-set provide a support to fetch MAC addr sequentially from env and apply them to "ethernet" nodes in the order they appear in device tree only if "ethernet" is not "disabled" It also disables "ethernet" nodes in device tree based ethernet port availability in the selected SerDes protocol. Currently the changes are done foe LS1046A. This has been added as a compile time option for now, to keep backward compatibility. The associated documentation is also updated in the README. Other platforms should also follow same approach. Prabhakar Kushwaha (3): common: Fix-up MAC addr in dts by fetching env variable serially arm: Add support of updating dts before fix-up boards: ls1046ardb: disable unavailable "ethernet" node in dts README | 9 +++++++ arch/arm/lib/bootm-fdt.c | 12 ++++++++++ board/freescale/ls1046ardb/eth.c | 51 ++++++++++++++++++++++++++++++++++++++++ common/fdt_support.c | 25 ++++++++++++++++---- include/configs/ls1046ardb.h | 2 ++ include/fdt_support.h | 3 +++ 6 files changed, 98 insertions(+), 4 deletions(-) -- 2.7.4

3 3

Re: [U-Boot] [PATCH] MAINTAINERS: git-mailrc: Update the maintainer for rmobile
by Nobuhiro Iwamatsu 08 Dec '17

08 Dec '17

Hi, 2017-12-01 18:07 GMT+09:00 Marek Vasut <marek.vasut(a)gmail.com>: > On 12/01/2017 06:02 AM, Nobuhiro Iwamatsu wrote: >> Adding Marek Vasut to MAINTAINERS and git-mailrc for the Renesas ARM rmobile >> architecture. >> >> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> > > This mailrc should be pointed to marek.vasut+renesas(a)gmail.com instead , > can you send V2 please ? OK, I will resend. Best regards, Nobuhiro > >> --- >> doc/git-mailrc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/doc/git-mailrc b/doc/git-mailrc >> index 5a365cddd9..f2fc6d4c5e 100644 >> --- a/doc/git-mailrc >> +++ b/doc/git-mailrc >> @@ -66,7 +66,7 @@ alias imx uboot, sbabic >> alias kirkwood uboot, prafulla, luka >> alias omap ti >> alias pxa uboot, marex >> -alias rmobile uboot, iwamatsu >> +alias rmobile uboot, iwamatsu, marex >> alias s3c samsung >> alias s5pc samsung >> alias samsung uboot, prom >> > > > -- > Best regards, > Marek Vasut -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

1 0

[U-Boot] [PATCH v1 0/2] arm: ppc: Share DPAA1 fixups between ARCHs
by Ahmed Mansour 08 Dec '17

08 Dec '17

- Support DPAA1 QBMan device tree fixups in a shared location for both arm and ppc architectures - cleanup a define from header files and add as Kconfig with auto selection based on SOC Ahmed Mansour (2): drivers/misc: Share qbman init between archs Move SYS_DPAA_QBMAN to Kconfig arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 4 + arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 15 + .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 3 + .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 29 ++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 3 +- arch/powerpc/cpu/mpc85xx/fdt.c | 1 + arch/powerpc/cpu/mpc85xx/portals.c | 281 ------------------- arch/powerpc/include/asm/fsl_liodn.h | 7 +- arch/powerpc/include/asm/fsl_portals.h | 4 - arch/powerpc/include/asm/immap_85xx.h | 60 ---- drivers/misc/Makefile | 1 + drivers/misc/portals.c | 312 +++++++++++++++++++++ drivers/net/Kconfig | 22 ++ include/configs/B4860QDS.h | 1 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/ls1046a_common.h | 4 - include/fsl_qbman.h | 75 +++++ 28 files changed, 469 insertions(+), 365 deletions(-) create mode 100644 drivers/misc/portals.c create mode 100644 include/fsl_qbman.h -- 2.7.4

2 3

[U-Boot] [PATCH v4 00/15] log: Add a new logging feature
by Simon Glass 07 Dec '17

07 Dec '17

U-Boot currently has fairly rudimentary logging features. A basic printf() provides console output and debug() provides debug output which is activated if DEBUG is defined in the file containing the debug() statements. It would be useful to have a few more features: - control of debug output at runtime, so problems can potentially be debugged without recompiling U-Boot - control of which subsystems output debug information, so that (for example) it is possible to enable debugging for MMC or SATA at runtime - indication of severity with each message, so that the user can control whether just errors are displayed, warnings, or all debug messages - sending logging information to different destinations, such as console, memory, linux, etc, At present U-Boot has a logbuffer feature which records output in a memory buffer for later display or storage. This is useful but is not at present enabled for any board. This series introduced a new logging system which supports: - various log levels from panic to debug - log categories including all uclasses and a few others - log drivers to which all log records can be sent - log filters which control which log records make it to which drivers Enabling logging with the default options does not add much to code size. By default the maximum recorded log level is LOGL_INFO, meaning that debug messages (and above) are discarded a build-time. Increasing this level provides more run-time flexibility to enable/disable logging at the cost of increased code size. This feature is by no means finished. The README provides a long list of features and clean-ups that could be done. But hopefully this is a starting point for improving this important area in U-Boot. The series is available at u-boot-dm/log-working Changes in v4: - Add an extra tab in the debug_cond() macro - Add new patch to correct use of debug() in usb_hub.c - Handle casting uclass ID to lgo category (for clang) Changes in v3: - Rebase to master Changes in v2: - Add a comment as to why CONFIG_LOG_MAX_LEVEL is not defined - Change log levels to match new header - Change sandbox log level to 6 - Drop MAINTAINERS entries for files not added by this patch - Drop the special log() functions from the README - Drop the use of 'continue' in the macro - Fix LOG_SPL_MAX_LEVEL typo (should be SPL_LOG_MAX_LEVEL) - Fix function called when test command is selected - Fix help output for 'log test' - Fix up bad use of #if CONFIG_VAL() - use #ifdef instead - Line up log levels with Linux - Only execute log tests if CONFIG_LOG is enabled - Rename LOGL_WARN to LOGL_WARNING - Split pre-console address change into a separate patch - Update commit message to explain that this is not just for serial output Simon Glass (15): Revert "sandbox: remove os_putc() and os_puts()" sandbox: Adjust pre-console address to avoid conflict Revert "sandbox: Drop special case console code for sandbox" Move debug and logging support to a separate header mtdparts: Correct use of debug() usb: Correct use of debug() Drop the log buffer log: Add an implementation of logging log: Add a console driver log: Add a 'log level' command log: Add a test command log: Plumb logging into the init sequence log: sandbox: Enable logging log: test: Add a pytest for logging log: Add documentation MAINTAINERS | 9 ++ arch/sandbox/cpu/os.c | 11 ++ cmd/Kconfig | 8 + cmd/Makefile | 2 +- cmd/log.c | 326 +++++--------------------------------- cmd/mtdparts.c | 3 - common/Kconfig | 86 ++++++++++ common/Makefile | 2 + common/board_f.c | 23 +-- common/board_r.c | 27 +--- common/console.c | 7 + common/image.c | 9 -- common/log.c | 245 ++++++++++++++++++++++++++++ common/log_console.c | 23 +++ common/stdio.c | 6 - common/usb_hub.c | 4 +- configs/sandbox_defconfig | 5 +- doc/README.log | 214 +++++++++++++++++++++++++ include/asm-generic/global_data.h | 8 +- include/common.h | 46 +----- include/log.h | 304 +++++++++++++++++++++++++++++++++++ include/logbuff.h | 49 ------ include/os.h | 20 +++ include/post.h | 4 +- post/post.c | 9 -- post/tests.c | 4 - scripts/config_whitelist.txt | 1 - test/Makefile | 1 + test/log/Makefile | 7 + test/log/log_test.c | 205 ++++++++++++++++++++++++ test/py/tests/test_log.py | 101 ++++++++++++ 31 files changed, 1304 insertions(+), 465 deletions(-) create mode 100644 common/log.c create mode 100644 common/log_console.c create mode 100644 doc/README.log create mode 100644 include/log.h delete mode 100644 include/logbuff.h create mode 100644 test/log/Makefile create mode 100644 test/log/log_test.c create mode 100644 test/py/tests/test_log.py -- 2.15.0.531.g2ccb3012c9-goog

2 30

[U-Boot] [PATCH] armv8: fix gd after relocation
by York Sun 07 Dec '17

07 Dec '17

Commit 21f4486faa5d ("armv8: update gd after relocate") sets x18 without checking the return value of spl_relocate_stack_gd(). Signed-off-by: York Sun <york.sun(a)nxp.com> CC: Kever Yang <kever.yang(a)rock-chips.com> CC: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- arch/arm/lib/crt0_64.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index ccefce0..9cb7055 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -120,8 +120,9 @@ relocation_return: #endif /* !CONFIG_SPL_BUILD */ #if defined(CONFIG_SPL_BUILD) bl spl_relocate_stack_gd /* may return NULL */ - /* set up gd here, outside any C code */ - mov x18, x0 + /* set up gd here, outside any C code, if new stack is returned */ + cmp x0, #0 + csel x18, x0, x18, ne /* * Perform 'sp = (x0 != NULL) ? x0 : sp' while working * around the constraint that conditional moves can not -- 2.7.4

3 2

[U-Boot] [PATCH] armv8: update gd after relocate
by Kever Yang 07 Dec '17

07 Dec '17

We need to update gd in assamble code after relocate, this is a fix to: adc421e arm: move gd handling outside of C code Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/lib/crt0_64.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 62fad45..2008b76 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -113,6 +113,8 @@ relocation_return: #endif /* !CONFIG_SPL_BUILD */ #if defined(CONFIG_SPL_BUILD) bl spl_relocate_stack_gd /* may return NULL */ + /* set up gd here, outside any C code */ + mov x18, x0 /* * Perform 'sp = (x0 != NULL) ? x0 : sp' while working * around the constraint that conditional moves can not -- 1.9.1

4 4

[U-Boot] [PATCH] rockchip: rk3399-puma: preserve leading zeros in serial#
by Jakob Unterwurzacher 07 Dec '17

07 Dec '17

Linux preserves leading zeros in /proc/cpuinfo, so we should as well. Otherwise we have the situation that /sys/firmware/devicetree/base/serial-number and /proc/cpuinfo disagree in Linux. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com> --- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 26c4535f1b..737206ae0f 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -138,7 +138,7 @@ static void setup_serial(void) serialno = crc32_no_comp(0, low, 8); serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32; - snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno); + snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno); env_set("cpuid#", cpuid_str); env_set("serial#", serialno_str); -- 2.11.0

3 3

[U-Boot] [PATCH] rockchip: board: puma-rk3399: define ENV_SIZE for SPI FLASH
by Klaus Goger 07 Dec '17

07 Dec '17

be942f2e0d introduced a common CONFIG_ENV_SIZE of 32k in rockchip-common.h On puma-rk3399 with ENV_IN_SPI active we place the environment in the gap between SPL and the FIT image. Previously undefined it defaulted to one sector defined with CONFIG_ENV_SECT_SIZE. With the now larger environment a saveenv overwrites the FIT image. Therefore we now redefine CONFIG_ENV_SIZE if build for ENV_IS_IN_SPI_FLASH. Signed-off-by: Klaus Goger <klaus.goger(a)theobroma-systems.com> --- include/configs/puma_rk3399.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 39d0786266..c9d475ebbb 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -20,6 +20,8 @@ #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 1 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_SECT_SIZE (8 * 1024) #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -- 2.11.0

2 2