August 2018 - U-Boot

[U-Boot] [PATCH] sunxi: disable Pine A64 model detection code on non-A64 SoCs
by Icenowy Zheng 20 Aug '18

20 Aug '18

The Pine A64 Plus/non-Plus model detection code is now built on all 64-bit ARM SoCs, even if the code cannot be triggered when H5/H6 is in use. Disable them when the SoC is not A64 by use #ifdef to wrap them. On GCC 7.3.1 this makes the size of the function reduces 184 bytes, and saves a 104 byte strstr() function, then makes SPL on H6 succeed to build. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> --- board/sunxi/board.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 857d5ff010..4fb0ff2529 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -823,13 +823,14 @@ int board_fit_config_name_match(const char *name) }; /* Differentiate the two Pine64 board DTs by their DRAM size. */ +#ifdef CONFIG_MACH_SUN50I if (strstr(name, "-pine64") && strstr(cmp_str, "-pine64")) { if ((gd->ram_size > 512 * 1024 * 1024)) return !strstr(name, "plus"); else return !!strstr(name, "plus"); - } else { - return strcmp(name, cmp_str); } +#endif + return strcmp(name, cmp_str); } #endif -- 2.18.0

2 1

[U-Boot] [PATCH v2] Convert CONFIG_BOARD_LATE_INIT to Kconfig
by Ramon Fried 20 Aug '18

20 Aug '18

This converts the remaining board defined CONFIG_BOARD_LATE_INIT to Kconfig. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- Changes in v2: * Removed config from Kconfig as it already exists on common/Kconfig. * Changed the commit message. configs/am335x_pdu001_defconfig | 1 + configs/bcm7445_defconfig | 1 + configs/cl-som-imx7_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/hsdk_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/stm32f746-disco_defconfig | 1 + configs/stm32h743-disco_defconfig | 1 + configs/stm32h743-eval_defconfig | 1 + include/configs/bcmstb.h | 1 - include/configs/cl-som-imx7.h | 2 -- include/configs/controlcenterdc.h | 1 - include/configs/hsdk.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/pdu001.h | 1 - include/configs/stm32f746-disco.h | 1 - include/configs/stm32h743-disco.h | 1 - include/configs/stm32h743-eval.h | 1 - include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/zynq_cse.h | 1 - 23 files changed, 11 insertions(+), 13 deletions(-) diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index 625ee6603d..3a69bbf460 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am335x-pdu001" CONFIG_LOCALVERSION="-EETS-1.0.0" +CONFIG_BOARD_LATE_INIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 8b4247882f..c1e8194fcc 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_BCMSTB=y CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_BCM7445=y +CONFIG_BOARD_LATE_INIT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTDELAY=1 diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index d47dd66197..3321d02e14 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y +CONFIG_BOARD_LATE_INIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3 diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index a66a281ede..e492a09255 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="armada-38x-controlcenterdc" CONFIG_DEBUG_UART=y +CONFIG_BOARD_LATE_INIT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index eec19478c6..332cc6a2b7 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -7,6 +7,7 @@ CONFIG_DEBUG_UART_CLOCK=33333333 CONFIG_SYS_CLK_FREQ=500000000 CONFIG_DEFAULT_DEVICE_TREE="hsdk" CONFIG_DEBUG_UART=y +CONFIG_BOARD_LATE_INIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200n8" CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 93cf3eef27..b5e3152443 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_MCCMON6=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg" # CONFIG_USE_BOOTCOMMAND is not set diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 2abaa82a35..23bcb37d06 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y # CONFIG_CMD_BMODE is not set +CONFIG_BOARD_LATE_INIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg" # CONFIG_USE_BOOTCOMMAND is not set diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 8a0cc5d481..9bd20cb4b6 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y CONFIG_SYS_TEXT_BASE=0x77800000 CONFIG_TARGET_MX53PPD=y +CONFIG_BOARD_LATE_INIT=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ge/mx53ppd/imximage.cfg" CONFIG_BOOTDELAY=1 diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index b376e8b1c3..e9b2318b42 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0xC00 CONFIG_STM32F7=y CONFIG_TARGET_STM32F746_DISCO=y CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco" +CONFIG_BOARD_LATE_INIT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index e98d18c11d..c1131318e2 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0xF00 CONFIG_STM32H7=y CONFIG_TARGET_STM32H743_DISCO=y CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-disco" +CONFIG_BOARD_LATE_INIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 84d0ca7a84..636981d5d2 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0xF00 CONFIG_STM32H7=y CONFIG_TARGET_STM32H743_EVAL=y CONFIG_DEFAULT_DEVICE_TREE="stm32h743i-eval" +CONFIG_BOARD_LATE_INIT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index c74fe4086e..2cc5b4f0c2 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -183,6 +183,5 @@ extern phys_addr_t prior_stage_fdt_address; * Set fdtaddr to prior stage-provided DTB in board_late_init, when * writeable environment is available. */ -#define CONFIG_BOARD_LATE_INIT #endif /* __BCMSTB_H */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index faea6c6b93..972872f2c5 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -17,8 +17,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) -#define CONFIG_BOARD_LATE_INIT - /* Uncomment to enable secure boot support */ /* #define CONFIG_SECURE_BOOT */ #define CONFIG_CSF_SIZE 0x4000 diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index b38cab1164..0fce0fa38b 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -13,7 +13,6 @@ #define CONFIG_CUSTOMER_BOARD_SUPPORT #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_BOARD_LATE_INIT /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 5da053002e..222252a08b 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -128,6 +128,5 @@ setenv core_iccm_3 0x6; setenv core_dccm_3 0x6;\0" /* * Callback configuration */ -#define CONFIG_BOARD_LATE_INIT #endif /* _CONFIG_HSDK_H_ */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 0816fae365..372bcf119f 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -35,7 +35,6 @@ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index e08e83151f..c38d198f7e 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -27,7 +27,6 @@ #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 #define CONFIG_MISC_INIT_R -#define CONFIG_BOARD_LATE_INIT #define CONFIG_REVISION_TAG #define CONFIG_MXC_UART diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 7b809e2329..012de3b16f 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -23,7 +23,6 @@ #define MACH_TYPE_PDU001 5075 #define CONFIG_MACH_TYPE MACH_TYPE_PDU001 -#define CONFIG_BOARD_LATE_INIT /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 3a76c5807a..e654407b5b 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -57,7 +57,6 @@ /* * Command line configuration. */ -#define CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_BOARDINFO /* For SPL */ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 822ab2de77..67dbee0b6c 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -49,6 +49,5 @@ /* * Command line configuration. */ -#define CONFIG_BOARD_LATE_INIT #endif /* __CONFIG_H */ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index b49dc1a34a..8bc5247261 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -49,6 +49,5 @@ /* * Command line configuration. */ -#define CONFIG_BOARD_LATE_INIT #endif /* __CONFIG_H */ diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index becb125f0a..f4c02276f9 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -24,7 +24,6 @@ #undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_LINUX -#undef CONFIG_BOARD_LATE_INIT /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index c4587a1837..e7a4d4108a 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_BOARD_LATE_INIT #undef CONFIG_ZLIB #undef CONFIG_GZIP -- 2.18.0

4 6

[U-Boot] [PATCH] env: Merge Rockchip, Sunxi, Zynq and ZynqMP
by Michal Simek 20 Aug '18

20 Aug '18

There is no reason to have the same Kconfig options for different SoCs separately. The patch is merging them together. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Patch is based on https://lists.denx.de/pipermail/u-boot/2018-July/335126.html I have ENV_SECT_SIZE just for zynq/zynqmp because rockchip and sunxi have this in their configs. When they decide to move then can enable that option for them too. I expect when more platforms extend this we will have less constrain Kconfig setup. --- env/Kconfig | 66 ++++++++++++++++--------------------------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index b37dcd78eb75..0ded003d7d41 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,23 +431,37 @@ config ENV_EXT4_FILE It's a string of the EXT4 file name. This file use to store the environment (explicit path to the file) -if ARCH_SUNXI +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP config ENV_OFFSET hex "Environment Offset" depends on !ENV_IS_IN_UBI depends on !ENV_IS_NOWHERE + default 0x3f8000 if ARCH_ROCKCHIP default 0x88000 if ARCH_SUNXI + default 0xE0000 if ARCH_ZYNQ + default 0x1E00000 if ARCH_ZYNQMP help Offset from the start of the device (or partition) config ENV_SIZE hex "Environment Size" - depends on !ENV_IS_NOWHERE - default 0x20000 if ARCH_SUNXI + default 0x8000 if ARCH_ROCKCHIP && !ENV_IS_NOWHERE + default 0x20000 if ARCH_SUNXI && !ENV_IS_NOWHERE + default 0x20000 if ARCH_ZYNQ + default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP + default 0x8000 if ARCH_ZYNQMP help Size of the environment storage area +config ENV_SECT_SIZE + hex "Environment Sector-Size" + depends on !ENV_IS_NOWHERE && (ARCH_ZYNQ || ARCH_ZYNQMP) + default 0x40000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the sector containing the environment. + config ENV_UBI_PART string "UBI partition name" depends on ENV_IS_IN_UBI @@ -462,52 +476,6 @@ config ENV_UBI_VOLUME endif -if ARCH_ROCKCHIP - -config ENV_OFFSET - hex - depends on !ENV_IS_IN_UBI - depends on !ENV_IS_NOWHERE - default 0x3f8000 - help - Offset from the start of the device (or partition) - -config ENV_SIZE - hex - default 0x8000 - help - Size of the environment storage area - -endif - -if ARCH_ZYNQMP || ARCH_ZYNQ - -config ENV_OFFSET - hex "Environment Offset" - depends on !ENV_IS_NOWHERE - default 0x1E00000 if ARCH_ZYNQMP - default 0xE0000 if ARCH_ZYNQ - help - Offset from the start of the device (or partition) - -config ENV_SIZE - hex "Environment Size" - default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP - default 0x8000 if ARCH_ZYNQMP - default 0x20000 if ARCH_ZYNQ - help - Size of the environment storage area. - -config ENV_SECT_SIZE - hex "Environment Sector-Size" - depends on !ENV_IS_NOWHERE - default 0x40000 if ARCH_ZYNQMP - default 0x20000 if ARCH_ZYNQ - help - Size of the sector containing the environment. - -endif - config USE_DEFAULT_ENV_FILE bool "Create default environment from file" help -- 1.9.1

3 9

[U-Boot] [PATCH] configs: sun7i: Fix to use emmc dts for OLinuXino_MICRO-eMMC
by Jagan Teki 20 Aug '18

20 Aug '18

A20 OLinuXino Micro eMMC board has emmc with mmc2 slot so use proper dts, sun7i-a20-olinuxino-micro-emmc.dts Cc: Stefan Mavrodiev <stefan(a)olimex.com> Cc: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- configs/A20-OLinuXino_MICRO-eMMC_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig index f7e7cbab0a..a03c752aa6 100644 --- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig @@ -8,7 +8,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_I2C1_ENABLE=y CONFIG_VIDEO_VGA=y CONFIG_SATAPWR="PB8" -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C_SUPPORT=y -- 2.18.0.321.gffc6fa0e3

2 2

[U-Boot] [PATCH 1/4] env: fat: drop not needed #ifdef CMD_SAVEENV
by Christian Gmeiner 20 Aug '18

20 Aug '18

env_save_ptr(..) macro handles CMD_SAVEENV already. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- env/fat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/env/fat.c b/env/fat.c index 7f74c64dfe..165a11345f 100644 --- a/env/fat.c +++ b/env/fat.c @@ -134,7 +134,5 @@ U_BOOT_ENV_LOCATION(fat) = { #ifdef LOADENV .load = env_fat_load, #endif -#ifdef CMD_SAVEENV .save = env_save_ptr(env_fat_save), -#endif }; -- 2.17.1

3 8

[U-Boot] Chain loading U-Boot on ARM v7, data abort
by Neil Stainton 20 Aug '18

20 Aug '18

Hello list, I am attempting to get U-Boot chain loading another instance of U-Boot and need a little help: I'm currently using the Freescale iMX6ULL EVK, but am developing for a custom platform which is intended to have a primary boot loader in ROM and a field-updatable secondary boot loader, with a redundant backup, both stored in flash. I am currently testing with QSPI. I figured on storing the secondary boot loader in ELF format (stripped) at known offset in QSPI and have been attempting to get the bootelf command load and execute it, either directly from the mapped QSPI address space, or by 'sf reading' the ELF file into ${loadaddr} and bootelf it from there. I have ensured .text and $loadaddr don't overlap. The problem I am seeing happens after the secondary image starts, during its relocation to the top of external RAM. The processor gets a data abort interrupt and U-Boot subsequently hard resets. I switched on the debug messages just for common/board_f.c on an otherwise mostly mx6ull_14x14_evk_defconfig from the v2018.07 tag and this is what I see immediately prior to the reset: Monitor len: 0005ACCC Ram size: 20000000 Ram top: A0000000 TLB table from 9fff0000 to 9fff4000 Reserving 363k for U-Boot at: 9ff95000 Reserving 16392k for malloc() at: 9ef93000 Reserving 80 Bytes for Board Info at: 9ef92fb0 Reserving 240 Bytes for Global Data at: 9ef92ec0 RAM Configuration: Bank #0: 80000000 DRAM: 512 MiB New Stack Pointer is: 9ef92ea0 Relocation Offset is: 18795000 Relocating to 9ff95000, new gd at 9ef92ec0, sp at 9ef92ea0 data abort pc : [<87800c5c>] lr : [<9ff9570c>] sp : 9ef92ea0 ip : 00000030 fp : 00000017 r10: 878538dc r9 : 9ef92ec0 r8 : 9ffe8e98 r7 : 9ef95460 r6 : 87800000 r5 : 87800320 r4 : 18795000 r3 : 8785c648 r2 : 8785acd0 r1 : 00000017 r0 : 18795000 Flags: nZCv IRQs off FIQs off Mode SVC_32 Code: e20110ff e3510017 1a000003 e0800004 (e5901000) Resetting CPU ... resetting ... U-Boot 2018.07-00008-ga14c5cc-dirty (Aug 16 2018 - 14:03:26 +0100) The PC points to somewhere in arch/arm/lib/relocate.S. Here's the excerpt of the disassembly: 87800c48 <fixloop>: fixloop: ldmia r2!, {r0-r1} /* (r0,r1) <- (SRC location,fixup) */ 87800c48: e8b20003 ldm r2!, {r0, r1} and r1, r1, #0xff 87800c4c: e20110ff and r1, r1, #255 ; 0xff cmp r1, #R_ARM_RELATIVE 87800c50: e3510017 cmp r1, #23 bne fixnext 87800c54: 1a000003 bne 87800c68 <fixnext> /* relative fix: increase location by offset */ add r0, r0, r4 87800c58: e0800004 add r0, r0, r4 ldr r1, [r0] 87800c5c: e5901000 ldr r1, [r0] add r1, r1, r4 87800c60: e0811004 add r1, r1, r4 str r1, [r0] 87800c64: e5801000 str r1, [r0] 87800c68 <fixnext>: fixnext: cmp r2, r3 87800c68: e1520003 cmp r2, r3 blo fixloop 87800c6c: 3afffff5 bcc 87800c48 <fixloop> 87800c70 <relocate_done>: What could be going wrong here? Could it be something to do with the MMU or cache being left in a non-reset state by bootelf? I did try adding a call to cleanup_before_linux in do_bootelf_exec, but it made no obvious difference. Thanks for any insights, Neil

1 1

[U-Boot] sunxi: USB gadget does not work on H2+ after 92a30692b2b18f45aae6fdaae38d67ed03dd2d11
by Nuno Gonçalves 20 Aug '18

20 Aug '18

After this commit usb gadget does not work anymore for me on the Orange Pi Zero (H2+). Thanks, Nuno commit 92a30692b2b18f45aae6fdaae38d67ed03dd2d11 Author: Jagan Teki <jagan(a)amarulasolutions.com> Date: Fri Jul 20 12:34:20 2018 +0530 phy: sun4i-usb: Call phy_passby even for PHY#0 On newer Allwinner SoC, there is a pair of EHCI/OHCI USB hosts for OTG host mode. USB PHY passby must be configured for its corresponding PHY. so we can call for PHY#0. on the other hand in past usb-phy code the same thing can be restricted for Lower SoC's, other than H3/H5/A64. Now there is no need to restrict usb passby since the phy driver is DT enabled, and the respective phy calls will trigger based DT information initiated by the drivers. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> Tested-by: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 2b3cf48025..01f585a283 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -300,8 +300,7 @@ static int sun4i_usb_phy_init(struct phy *phy) data->cfg->disc_thresh, PHY_DISCON_TH_LEN); } - if (usb_phy->id != 0) - sun4i_usb_phy_passby(phy, true); + sun4i_usb_phy_passby(phy, true); sun4i_usb_phy0_reroute(data, true);

2 11

[U-Boot] [PATCH] arm64: zynqmp: Handle CONFIG_BOARD_LATE_INIT via Kconfig
by Michal Simek 20 Aug '18

20 Aug '18

Disable BOARD_LATE_INIT via Kconfig. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- This is correct resolution of BOARD_LATE_INIT for xilinx boards where we want to disable late init for mini u-boot configurations. I have took Kconfig fragment description from Ramon. --- arch/arm/Kconfig | 4 ++-- common/Kconfig | 2 +- configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/zynq_cse.h | 1 - 11 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f5eaf8591b6..b369a496f5dd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -854,7 +854,6 @@ config ARCH_VF610 config ARCH_ZYNQ bool "Xilinx Zynq based platform" select BOARD_EARLY_INIT_F if WDT - select BOARD_LATE_INIT select CLK select CLK_ZYNQ select CPU_V7A @@ -874,6 +873,7 @@ config ARCH_ZYNQ select SPL_SEPARATE_BSS if SPL select SUPPORT_SPL imply ARCH_EARLY_INIT_R + imply BOARD_LATE_INIT imply CMD_CLK imply CMD_DM imply CMD_SPL @@ -891,7 +891,6 @@ config ARCH_ZYNQMP_R5 config ARCH_ZYNQMP bool "Xilinx ZynqMP based platform" select ARM64 - select BOARD_LATE_INIT select CLK select DM select DM_SERIAL @@ -900,6 +899,7 @@ config ARCH_ZYNQMP select SPL_BOARD_INIT if SPL select SPL_CLK if SPL select SUPPORT_SPL + imply BOARD_LATE_INIT imply CMD_DM imply FAT_WRITE diff --git a/common/Kconfig b/common/Kconfig index b3d9b3746356..e86bf9dc63ef 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -557,7 +557,7 @@ config VERSION_VARIABLE next reset. config BOARD_LATE_INIT - bool + bool "Execute Board late init" help Sometimes board require some initialization code that might require once the actual init done, example saving board specific env, diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 5edbba1a4966..1203438ad195 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -10,6 +10,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 8cb47ce4ccc5..23af0f436e29 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -10,6 +10,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index afdfcd5d7701..db20a24f562d 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 9e404bd5f967..9a299e7eafbe 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi" CONFIG_NR_DRAM_BANKS=1 # CONFIG_IMAGE_FORMAT_LEGACY is not set CONFIG_BOOTDELAY=-1 +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 32027c491f3e..abd1db7994c0 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y CONFIG_SYS_PROMPT="Zynq> " diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 3052c5b22a2e..51ee193f0005 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SYS_MALLOC_LEN=0x1000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" CONFIG_BOOTDELAY=-1 +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y CONFIG_SYS_PROMPT="Zynq> " diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index c27daad92fab..cb27d5a5c7e0 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -16,6 +16,7 @@ CONFIG_DISTRO_DEFAULTS=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTDELAY=-1 # CONFIG_USE_BOOTCOMMAND is not set +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_ARCH_EARLY_INIT_R is not set CONFIG_SPL_STACK_R=y diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 1387d39e7915..00ca3d4be825 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -24,7 +24,6 @@ #undef CONFIG_BOOTM_NETBSD #undef CONFIG_BOOTM_VXWORKS #undef CONFIG_BOOTM_LINUX -#undef CONFIG_BOARD_LATE_INIT /* BOOTP options */ #undef CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index c4587a1837c8..e7a4d4108ae9 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS -#undef CONFIG_BOARD_LATE_INIT #undef CONFIG_ZLIB #undef CONFIG_GZIP -- 1.9.1

1 0

[U-Boot] [PATCH 1/6] x86: coreboot: Add generic coreboot payload support
by Bin Meng 20 Aug '18

20 Aug '18

Currently building U-Boot as the coreboot payload requires user to change the build configuration for a specific board during menuconfig process. This uses the board's native device tree to configure the hardware. For example, the device tree provides PCI address range for the PCI host controller and U-Boot will re-program all PCI devices' BAR to be within this range. In order to make sure we don't mess up the hardware, we should guarantee the range matches what coreboot programs the chipset. But we really should make the coreboot payload support easier. Just like EFI payload, we can create a generic coreboot payload for all x86 boards as well. The payload is configured to include as many generic drivers as possible. All stuff that touches low level initialization are not allowed as such is the coreboot's responsibility. Platform specific drivers (like gpio, spi, etc) are not included. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/coreboot/Kconfig | 20 +++++------ arch/x86/cpu/coreboot/coreboot.c | 9 +++-- arch/x86/dts/Makefile | 1 + arch/x86/dts/coreboot.dts | 41 ++++++++++++++++++++++ board/coreboot/coreboot/Kconfig | 28 +++------------ board/coreboot/coreboot/Makefile | 2 +- board/coreboot/coreboot/coreboot.c | 17 +++++++++ .../coreboot/{coreboot_start.S => start.S} | 0 configs/coreboot_defconfig | 18 ++++------ doc/README.x86 | 15 -------- include/configs/coreboot.h | 32 +++++++++++++++++ 11 files changed, 116 insertions(+), 67 deletions(-) create mode 100644 arch/x86/dts/coreboot.dts create mode 100644 board/coreboot/coreboot/coreboot.c rename board/coreboot/coreboot/{coreboot_start.S => start.S} (100%) create mode 100644 include/configs/coreboot.h diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig index 392c258..93f61f2 100644 --- a/arch/x86/cpu/coreboot/Kconfig +++ b/arch/x86/cpu/coreboot/Kconfig @@ -3,26 +3,26 @@ if TARGET_COREBOOT config SYS_COREBOOT bool default y + imply SYS_NS16550 + imply SCSI + imply SCSI_AHCI imply AHCI_PCI - imply E1000 - imply ICH_SPI imply MMC imply MMC_PCI imply MMC_SDHCI imply MMC_SDHCI_SDMA - imply SCSI - imply SCSI_AHCI - imply SPI_FLASH - imply SYS_NS16550 imply USB imply USB_EHCI_HCD imply USB_XHCI_HCD + imply USB_STORAGE + imply USB_KEYBOARD imply VIDEO_COREBOOT + imply E1000 + imply ETH_DESIGNWARE + imply PCH_GBE + imply RTL8169 imply CMD_CBFS imply FS_CBFS - -config CBMEM_CONSOLE - bool - default y + imply CBMEM_CONSOLE endif diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 69025c1..a6fd3a8 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -7,6 +7,7 @@ #include <common.h> #include <fdtdec.h> +#include <usb.h> #include <asm/io.h> #include <asm/msr.h> #include <asm/mtrr.h> @@ -75,12 +76,10 @@ int last_stage_init(void) if (gd->flags & GD_FLG_COLD_BOOT) timestamp_add_to_bootstage(); - board_final_cleanup(); + /* start usb so that usb keyboard can be used as input device */ + usb_init(); - return 0; -} + board_final_cleanup(); -int misc_init_r(void) -{ return 0; } diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 37e4fdc..c62540f 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -6,6 +6,7 @@ dtb-y += bayleybay.dtb \ chromebox_panther.dtb \ chromebook_samus.dtb \ conga-qeval20-qa3-e3845.dtb \ + coreboot.dtb \ cougarcanyon2.dtb \ crownbay.dtb \ dfi-bt700-q7x-151.dtb \ diff --git a/arch/x86/dts/coreboot.dts b/arch/x86/dts/coreboot.dts new file mode 100644 index 0000000..a94f781 --- /dev/null +++ b/arch/x86/dts/coreboot.dts @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> + * + * Generic coreboot payload device tree for x86 targets + */ + +/dts-v1/; + +/include/ "skeleton.dtsi" +/include/ "serial.dtsi" +/include/ "keyboard.dtsi" +/include/ "reset.dtsi" +/include/ "rtc.dtsi" +/include/ "tsc_timer.dtsi" + +/ { + model = "coreboot x86 payload"; + compatible = "coreboot,x86-payload"; + + aliases { + serial0 = &serial; + }; + + config { + silent_console = <0>; + }; + + chosen { + stdout-path = "/serial"; + }; + + pci { + compatible = "pci-x86"; + u-boot,dm-pre-reloc; + }; + + coreboot-fb { + compatible = "coreboot-fb"; + }; +}; diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig index cfa1d50..5bd6465 100644 --- a/board/coreboot/coreboot/Kconfig +++ b/board/coreboot/coreboot/Kconfig @@ -9,35 +9,15 @@ config SYS_VENDOR config SYS_SOC default "coreboot" +config SYS_CONFIG_NAME + default "coreboot" + config SYS_TEXT_BASE default 0x01110000 config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - imply SPI_FLASH_ATMEL - imply SPI_FLASH_EON - imply SPI_FLASH_GIGADEVICE - imply SPI_FLASH_MACRONIX - imply SPI_FLASH_SPANSION - imply SPI_FLASH_STMICRO - imply SPI_FLASH_SST - imply SPI_FLASH_WINBOND - -comment "coreboot-specific options" - -config SYS_CONFIG_NAME - string "Board configuration file" - default "qemu-x86" - help - This option selects the board configuration file in include/configs/ - directory to be used to build U-Boot for coreboot. - -config DEFAULT_DEVICE_TREE - string "Board Device Tree Source (dts) file" - default "qemu-x86_i440fx" - help - This option selects the board Device Tree Source (dts) file in - arch/x86/dts/ directory to be used to build U-Boot for coreboot. + select BOARD_EARLY_INIT_R config SYS_CAR_ADDR hex "Board specific Cache-As-RAM (CAR) address" diff --git a/board/coreboot/coreboot/Makefile b/board/coreboot/coreboot/Makefile index ea0f3ee..8db7cc6 100644 --- a/board/coreboot/coreboot/Makefile +++ b/board/coreboot/coreboot/Makefile @@ -10,4 +10,4 @@ # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. -obj-y += coreboot_start.o +obj-y += start.o coreboot.o diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c new file mode 100644 index 0000000..ed5606d --- /dev/null +++ b/board/coreboot/coreboot/coreboot.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> + */ + +#include <common.h> + +int board_early_init_r(void) +{ + /* + * Make sure PCI bus is enumerated so that peripherals on the PCI bus + * can be discovered by their drivers + */ + pci_init(); + + return 0; +} diff --git a/board/coreboot/coreboot/coreboot_start.S b/board/coreboot/coreboot/start.S similarity index 100% rename from board/coreboot/coreboot/coreboot_start.S rename to board/coreboot/coreboot/start.S diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index 6af2f23..350acfb 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -3,28 +3,25 @@ CONFIG_SYS_TEXT_BASE=0x1110000 CONFIG_VENDOR_COREBOOT=y CONFIG_TARGET_COREBOOT=y CONFIG_FIT=y -CONFIG_BOOTSTAGE=y -CONFIG_BOOTSTAGE_REPORT=y +CONFIG_FIT_SIGNATURE=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y -CONFIG_CMD_BOOTSTAGE=y -CONFIG_CMD_TPM=y -CONFIG_CMD_TPM_TEST=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y @@ -33,11 +30,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_DEFAULT_DEVICE_TREE="coreboot" CONFIG_REGMAP=y CONFIG_SYSCON=y -CONFIG_SPI=y -CONFIG_TPM_TIS_LPC=y -CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y +# CONFIG_PCI_PNP is not set CONFIG_CONSOLE_SCROLL_LINES=5 -CONFIG_TPM=y diff --git a/doc/README.x86 b/doc/README.x86 index 9162ea1..6015ca4 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -47,21 +47,6 @@ on other architectures, like below: $ make coreboot_defconfig $ make all -Note this default configuration will build a U-Boot payload for the QEMU board. -To build a coreboot payload against another board, you can change the build -configuration during the 'make menuconfig' process. - -x86 architecture ---> - ... - (qemu-x86) Board configuration file - (qemu-x86_i440fx) Board Device Tree Source (dts) file - (0x01920000) Board specific Cache-As-RAM (CAR) address - (0x4000) Board specific Cache-As-RAM (CAR) size - -Change the 'Board configuration file' and 'Board Device Tree Source (dts) file' -to point to a new board. You can also change the Cache-As-RAM (CAR) related -settings here if the default values do not fit your new board. - Build Instructions for U-Boot as main bootloader ------------------------------------------------ diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h new file mode 100644 index 0000000..1cf5c03 --- /dev/null +++ b/include/configs/coreboot.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> + */ + +/* + * board/config.h - configuration options, board specific + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/x86-common.h> + +#define CONFIG_SYS_MONITOR_LEN (1 << 20) + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +/* ATA/IDE support */ +#define CONFIG_SYS_IDE_MAXBUS 2 +#define CONFIG_SYS_IDE_MAXDEVICE 4 +#define CONFIG_SYS_ATA_BASE_ADDR 0 +#define CONFIG_SYS_ATA_DATA_OFFSET 0 +#define CONFIG_SYS_ATA_REG_OFFSET 0 +#define CONFIG_SYS_ATA_ALT_OFFSET 0 +#define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0 +#define CONFIG_SYS_ATA_IDE1_OFFSET 0x170 +#define CONFIG_ATAPI + +#endif /* __CONFIG_H */ -- 2.7.4

4 19

[U-Boot] [PATCH 00/17] fs: fat: extend FAT write operations
by AKASHI Takahiro 20 Aug '18

20 Aug '18

This patch series is an attempt to address FAT write related issues in an effort of running UEFI SCT (Self-Certification Test) to verify UEFI support on u-boot. SCT is a test platform as well as an extentisive collection of test cases for UEFI specification. It can run all the tests automatically and save test results to dedicated log files. AFAIK, what's missing in the current fat file system to safely run SCT without errors (I don't mean test case failures) are: * write a file located under sub-directories * write a file with non-zero offset * delete a file * create a directory Patch#1 to patch#6 are some sort of preparatory ones. Patch#7 implements write with sub-directories path. Patch#8 to patch#10 implement write with non-zero offset. Patch#11 to patch#15 are related to creating a directory. Patch#16 provides delete, but it doesn't actually delete a file but instead return 0 with purging a file content, which is good enough to run SCT for now. Finally, patch#17 fixes a minor bug in fs-test.sh. I applied this patch set on top of v2018.07 along with a couple of yet-to--be-upstreamed UEFI-related patches, and could successfully run unmodified SCT[1] on qemu-arm. [1] http://uefi.org/testtools AKASHI Takahiro (17): fs: fat: extend get_fs_info() for write use fs: fat: handle "." and ".." of root dir correctly with fat_itr_resolve() fs: fat: make directory iterator global for write use fs: fat: assure iterator's ->dent belongs to ->clust fs: fat: check and normailze file name fs: fat: write returns error code instead of -1 fs: fat: support write with sub-directory path fs: fat: refactor write interface for a file offset fs: fat: support write with non-zero offset cmd: fat: add offset parameter to fatwrite fs: add mkdir interface fs: fat: remember the starting cluster number of directory fs: fat: support mkdir cmd: fat: add fatmkdir command efi_loader: file: support creating a directory efi_loader: implement a pseudo "file delete" fs-test: fix false positive error at Test Case 12 cmd/fat.c | 22 +- fs/fat/fat.c | 98 ++-- fs/fat/fat_write.c | 1051 +++++++++++++++++++++++-------------- fs/fs.c | 46 ++ include/fat.h | 37 ++ include/fs.h | 10 + lib/efi_loader/efi_file.c | 24 +- test/fs/fs-test.sh | 2 +- 8 files changed, 825 insertions(+), 465 deletions(-) -- 2.17.0

4 51