September 2018 - U-Boot

[U-Boot] [PATCH v2 01/13] pico-imx6ul: Convert to distro config
by Otavio Salvador 06 Sep '18

06 Sep '18

From: Fabio Estevam <festevam(a)gmail.com> Instead of keeping a custom environment, use a more generic approach by switching to disto config. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v2: None configs/pico-imx6ul_defconfig | 2 + include/configs/pico-imx6ul.h | 69 ++++++++++------------------------- 2 files changed, 21 insertions(+), 50 deletions(-) diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index 59ef7b7f22..3f969a2d6e 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -4,7 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_PICO_IMX6UL=y # CONFIG_CMD_BMODE is not set CONFIG_NR_DRAM_BANKS=1 +CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg" +CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 80a2d1fbdb..1a148bf1a6 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -52,64 +52,33 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc5\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x83000000\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "fdt_addr_r=0x83000000\0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x83000000\0" \ + "ramdiskaddr=0x83000000\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ CONFIG_DFU_ENV_SETTINGS \ - "finduuid=part uuid mmc 0:2 uuid\0" \ + "finduuid=part uuid mmc 0:1 uuid\0" \ "partitions=" \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,size=16MiB;name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ - "setup_emmc=gpt write mmc 0 $partitions; reset;\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=PARTUUID=${uuid} rootwait rw\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run finduuid; " \ - "run mmcargs; " \ - "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootz; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootz; " \ - "fi;\0" \ - -#define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "else run netboot; fi" + "name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ + "fastboot_partition_alias_system=rootfs\0" \ + "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + SZ_128M -- 2.18.0

5 19

[U-Boot] [PATCH] travis: Use kernel.org pre-built toolchain for riscv
by Bin Meng 06 Sep '18

06 Sep '18

This updates travis configuration to use kernel.org pre-built toolchain for riscv. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4db629d..95cfa5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,9 +87,8 @@ before_script: fi - if [[ "${TOOLCHAIN}" == "powerpc" ]]; then ./tools/buildman/buildman --fetch-arch powerpc; fi - if [[ "${TOOLCHAIN}" == "riscv" ]]; then - wget https://github.com/andestech/prebuilt/releases/download/20180530/riscv64-un… && - tar -C /tmp -xf riscv64-unknown-linux-gnu.tar.gz && - echo -e "\n[toolchain-prefix]\nriscv = /tmp/riscv64-unknown-linux-gnu/bin/riscv64-unknown-linux-gnu-" >> ~/.buildman; + ./tools/buildman/buildman --fetch-arch riscv64; + echo -e "\n[toolchain-alias]\nriscv = riscv64" >> ~/.buildman; fi - if [[ "${QEMU_TARGET}" != "" ]]; then git clone git://git.qemu.org/qemu.git /tmp/qemu; -- 2.7.4

2 4

[U-Boot] [PATCH] ARM: qemu-arm: Fix qemu_arm64_defconfig for QEMU 3.0
by Tuomas Tynkkynen 06 Sep '18

06 Sep '18

QEMU 3.0 introduced additional memory-mapped regions for PCI-E ECAM and MMIO. Thus we need to add them to our MMU map or U-Boot will crash with a Synchronous Abort during PCI-E probing when it tries to access the unmapped ECAM memory area. Reported-by: Jonathan Gray <jsg(a)jsg.id.au> Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> --- board/emulation/qemu-arm/qemu-arm.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index 1f5a33d520..812c90636d 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c @@ -17,7 +17,7 @@ static struct mm_region qemu_arm64_mem_map[] = { .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { - /* Peripherals */ + /* Lowmem peripherals */ .virt = 0x08000000UL, .phys = 0x08000000UL, .size = 0x38000000, @@ -31,6 +31,22 @@ static struct mm_region qemu_arm64_mem_map[] = { .size = 255UL * SZ_1G, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE + }, { + /* Highmem PCI-E ECAM memory area */ + .virt = 0x4010000000ULL, + .phys = 0x4010000000ULL, + .size = 0x10000000, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* Highmem PCI-E MMIO memory area */ + .virt = 0x8000000000ULL, + .phys = 0x8000000000ULL, + .size = 0x8000000000ULL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { /* List terminator */ 0, -- 2.16.3

3 2

[U-Boot] [PATCH] qemu-arm: Enable DHCP distro target
by Alexander Graf 06 Sep '18

06 Sep '18

When booting the QEMU virt machine with -net nic,model=e1000 we can already support network boot just fine today. So let's enable the default bootcmd to also evaluate DHCP responses properly. That way we can enable network boot seamlessly with the virt target. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- include/configs/qemu-arm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 913ff4f263..66729b7d4f 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -30,7 +30,8 @@ #define CONFIG_ENV_SIZE SZ_64K #define BOOT_TARGET_DEVICES(func) \ - func(SCSI, scsi, 0) + func(SCSI, scsi, 0) \ + func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -- 2.12.3

2 1

[U-Boot] [PATCH] amlogic: board p212: Fix Ethernet PHY init
by Jasper Kcoding 06 Sep '18

06 Sep '18

Without this patch the Ethernet PHY on the p212 board does not get fully configured. When this happens Ethernet does not function. The similar libretech-cc and khadas-vim boards have this code already. That's why the Ethernet on these boards do work. --- board/amlogic/p212/p212.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 06c2eaee47..d5ce5397f3 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -29,7 +29,7 @@ int misc_init_r(void) char serial[EFUSE_SN_SIZE]; ssize_t len; - meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, 0); + meson_gx_eth_init(PHY_INTERFACE_MODE_RMII, MESON_GXL_USE_INTERNAL_RMII_PHY); if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, -- 2.11.0

4 3

[U-Boot] [PATCH 1/1] lib/slre: remove superfluous assignment
by Heinrich Schuchardt 06 Sep '18

06 Sep '18

It makes no sense to assign a value to 'res' if the next use of the variable is an assignment. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/slre.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/slre.c b/lib/slre.c index e26d344865..969c46a859 100644 --- a/lib/slre.c +++ b/lib/slre.c @@ -703,8 +703,6 @@ int main(int argc, char *argv[]) (void) memset(caps, 0, sizeof(caps)); - res = 0; - res = slre_match(&slre, data, len, caps); printf("Result [%d]: %d\n", i, res); -- 2.16.2

2 1

[U-Boot] [PATCH 1/2] config_fallback: update CONFIG_SYS_BAUDRATE_TABLE
by Christian Gmeiner 06 Sep '18

06 Sep '18

Take the values from x86-common.h as inspiration. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- include/config_fallbacks.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index c18f19a550..4c1bdf5ee5 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -26,7 +26,8 @@ #endif #ifndef CONFIG_SYS_BAUDRATE_TABLE -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 2400, 4800, \ + 9600, 19200, 38400, 57600, 115200 } #endif /* Console I/O Buffer Size */ -- 2.17.1

2 4

[U-Boot] [PATCH 1/1] x86: qemu-x86 requires CONFIG_SYS_HZ=2000
by Heinrich Schuchardt 06 Sep '18

06 Sep '18

The sleep command only provides correct timings for CONFIG_SYS_HZ=2000 on qemu-x86_defconfig. This can be tested with date && sleep 4 && date Make CONFIG_SYS_HZ editable. Set it in qemu-x86_defconfig to 2000. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- configs/qemu-x86_defconfig | 1 + lib/Kconfig | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 12ea72f562..8fc725dcc4 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -51,3 +51,4 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +CONFIG_SYS_HZ=2000 diff --git a/lib/Kconfig b/lib/Kconfig index 622f3c26c3..f37db20593 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -82,12 +82,10 @@ config USE_PRIVATE_LIBGCC If unsure, say N. config SYS_HZ - int + int "Frequency of the timer" default 1000 help The frequency of the timer returned by get_timer(). - get_timer() must operate in milliseconds and this option must be - set to 1000. config USE_TINY_PRINTF bool "Enable tiny printf() version" -- 2.18.0

2 4

[U-Boot] [PATCH] x86: extend baudrate table with 57600
by Christian Gmeiner 06 Sep '18

06 Sep '18

Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- include/configs/x86-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b5ef8b5..9a97714 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -56,7 +56,7 @@ * Serial Configuration */ #define CONFIG_SYS_BAUDRATE_TABLE {300, 600, 1200, 2400, 4800, \ - 9600, 19200, 38400, 115200} + 9600, 19200, 38400, 57600, 115200} #define CONFIG_SYS_NS16550_PORT_MAPPED #define CONFIG_CMDLINE_EDITING -- 2.9.4

3 8

[U-Boot] Two CRC32 implementation in U-Boot, why?
by Bin Meng 06 Sep '18

06 Sep '18

Hi, Currently it seems that we have two CRC32 implementation in U-Boot. Two headers files are provided. 1. include/linux/crc32.h The implementation is drivers/mtd/ubi/crc32.c. Codes that use this implementation include: drivers/mtd/ubi/* drivers/mtd/ubispl/* fs/ubifs/* 2. include/u-boot/crc.h The implementation is lib/crc32.c Codes that use this implementation include: fs/btrfs/hash.c tools/* common/hash.c common/image.c common/image-fit.c lib/efi_loader/efi_boottime.c It looks that include/linux/crc32.h was originally imported from Linux kernel's include/linux/crc32.h, but the implementation in Linux kernel's lib/crc32.c was not imported to U-Boot's lib/crc32.c but to drivers/mtd/ubi/crc32.c. Why? Somehow U-Boot lib/crc32.c uses another different implementation from zlib. This is a mess. For example if I include both headers in one C file, it won't compile. Can we clean this up? Regards, Bin

2 4