August 2017 - U-Boot

[U-Boot] [PATCH] rockchip: rk3188: rock: adjust for SPL/TPL split
by Philipp Tomsich 06 Aug '17

06 Aug '17

With the changes to split SPL/TPL for the RK3368, I apparently missed some needed adjustments to the RK3188 Kconfig and rock_defconfig. This fixes build-issues for the rock board after applying the RK3368 enablement (and SPL/TPL) set that resulted from TPL_SERIAL_SUPPORT, TPL_ROCKCHIP_BACK_TO_BROM and TPL_TINY_MEMSET being separate symbols now. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- arch/arm/mach-rockchip/Makefile | 4 +++- arch/arm/mach-rockchip/rk3188/Kconfig | 3 --- configs/rock_defconfig | 2 ++ lib/Kconfig | 9 +++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index c3ed862..79e9704 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -35,7 +35,9 @@ obj-y += rk_timer.o endif obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ -obj-tpl-$(CONFIG_ROCKCHIP_RK3188) += rk3188/ +ifndef CONFIG_TPL_BUILD +obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188/ +endif obj-$(CONFIG_ROCKCHIP_RK322X) += rk322x/ obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/ obj-$(CONFIG_ROCKCHIP_RK3328) += rk3328/ diff --git a/arch/arm/mach-rockchip/rk3188/Kconfig b/arch/arm/mach-rockchip/rk3188/Kconfig index d129fcd..2bb3566 100644 --- a/arch/arm/mach-rockchip/rk3188/Kconfig +++ b/arch/arm/mach-rockchip/rk3188/Kconfig @@ -30,9 +30,6 @@ config TPL_LIBCOMMON_SUPPORT config TPL_LIBGENERIC_SUPPORT default y -config TPL_SERIAL_SUPPORT - default y - source "board/radxa/rock/Kconfig" endif diff --git a/configs/rock_defconfig b/configs/rock_defconfig index 101b159..eae284c 100644 --- a/configs/rock_defconfig +++ b/configs/rock_defconfig @@ -5,6 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3188=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_TARGET_ROCK=y CONFIG_SPL_STACK_R_ADDR=0x60080000 CONFIG_DEFAULT_DEVICE_TREE="rk3188-radxarock" @@ -49,5 +50,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y diff --git a/lib/Kconfig b/lib/Kconfig index 2f5a210..8163617 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -61,6 +61,15 @@ config SPL_TINY_MEMSET size-constrained envrionments even this may be too big. Enable this option to reduce code size slightly at the cost of some speed. +config TPL_TINY_MEMSET + bool "Use a very small memset() in TPL" + help + The faster memset() is the arch-specific one (if available) enabled + by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get + better performance by writing a word at a time. But in very + size-constrained envrionments even this may be too big. Enable this + option to reduce code size slightly at the cost of some speed. + config RBTREE bool -- 2.1.4

2 2

[U-Boot] [PATCH v2 0/6] rockchip: rk3368: remove secure timer usage and use DM timer
by Philipp Tomsich 06 Aug '17

06 Aug '17

Although this was originally inteded as a RFC to test out a concept, it's not become the tail-end of the RK3368 SPL/TPL enablement series. So here's v2 with everyone's requests integrated. Trying to answer Simon's question whether the address of the secure timer (for initialising stimer1 and starting up the ARMv8 generic timer) can be obtained from the DTS, here's a series that tries to give an answer. To summarise this answer in plain English: - The answer to the original question is: "no, but..." - The "but" is what's implemented here: we don't need the ARMv8 generic timer ticking in U-Boot, so we won't have to initialise it at all (this removing the need to obtain the address for stimer1). - We also have a "however": the size of the TPL binary increases by approx. 800 bytes (AArch64 code), as we need the DM timer support. This series is based on-top-of my RK3368 enablement series and will remove the secure timer initialisation. Support for the Rk3399 should be added in the next iteration. Changes in v2: - marks blob as maybe_unused (to accomodate the OF_CONTROL case w/o warnings) - remove the DEBUG (missed this initially, as there were no debug() calls in the file anyway) - rework the reload_value code for improved readability - pull the uc_priv->clock_rate init into the OF_PLATDATA block - add 'clock-frequency' prop to timer in the -u-boot.dtsi Philipp Tomsich (6): timer: add OF_PLATDATA support for timer-uclass dm: timer: normalise SPL and TPL support rockchip: timer: add device-model timer driver for RK3368 (and similar) dts: rk3368: make timer0 accessible for SPL and TPL rockchip: lion-rk3368: defconfig: enable DM timer for all stages rockchip: rk3368: remove setup of secure timer from TPL/SPL arch/arm/cpu/armv8/Makefile | 2 + arch/arm/dts/rk3368-lion-u-boot.dtsi | 5 ++ arch/arm/dts/rk3368.dtsi | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 20 ------ arch/arm/mach-rockchip/rk3368-board-tpl.c | 19 ------ common/spl/Kconfig | 8 --- configs/chromebook_link64_defconfig | 2 +- configs/lion-rk3368_defconfig | 4 ++ configs/qemu-x86_64_defconfig | 2 +- drivers/Makefile | 3 +- drivers/timer/Kconfig | 25 +++++++ drivers/timer/Makefile | 3 +- drivers/timer/rockchip_timer.c | 107 ++++++++++++++++++++++++++++++ drivers/timer/timer-uclass.c | 8 ++- 14 files changed, 155 insertions(+), 55 deletions(-) create mode 100644 drivers/timer/rockchip_timer.c -- 2.1.4

1 12

[U-Boot] [PATCH 1/3] rockchip: add u-boot specific dts for rk3368 based boards
by Andy Yan 06 Aug '17

06 Aug '17

Device drivers like debug serial, dmc should be enabled before relocation, so add u-boot.dtsi files to contain devices that should be marked as dm-pre-reloc. Signed-off-by: Andy Yan <andy.yan(a)rock-chips.com> --- arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 35 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 35 +++++++++++++++++++++++++++++++++ arch/arm/dts/rk3368-sheep-u-boot.dtsi | 35 +++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 arch/arm/dts/rk3368-geekbox-u-boot.dtsi create mode 100644 arch/arm/dts/rk3368-px5-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk3368-sheep-u-boot.dtsi diff --git a/arch/arm/dts/rk3368-geekbox-u-boot.dtsi b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi new file mode 100644 index 0000000..7cf4a36 --- /dev/null +++ b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ X11 + */ + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&service_msch { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&pmugrf { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; + diff --git a/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi new file mode 100644 index 0000000..633dfe1 --- /dev/null +++ b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ X11 + */ + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&service_msch { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&pmugrf { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&uart4 { + u-boot,dm-pre-reloc; +}; + diff --git a/arch/arm/dts/rk3368-sheep-u-boot.dtsi b/arch/arm/dts/rk3368-sheep-u-boot.dtsi new file mode 100644 index 0000000..7cf4a36 --- /dev/null +++ b/arch/arm/dts/rk3368-sheep-u-boot.dtsi @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ X11 + */ + +&pinctrl { + u-boot,dm-pre-reloc; +}; + +&service_msch { + u-boot,dm-pre-reloc; +}; + +&dmc { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&pmugrf { + u-boot,dm-pre-reloc; +}; + +&cru { + u-boot,dm-pre-reloc; +}; + +&grf { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; + -- 2.7.4

5 13

[U-Boot] [PATCH] rockchip: clk: rk3399: fix SPI clock code for SPI3
by Philipp Tomsich 06 Aug '17

06 Aug '17

On the RK3399, SPI3 is special (it's configured via PMUGRF). The implementation of the clock-setup for SPI3 was never supported (and the comments reflected this), but the implementation did not correctly handle this. This fixes the code to match the comments above it and returns an error when trying to configure SPI3. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/clk/rockchip/clk_rk3399.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 53d2a3f..d0f52c1 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -637,10 +637,10 @@ static const struct spi_clkreg spi_clkregs[] = { [2] = { .reg = 60, .div_shift = CLK_SPI2_PLL_DIV_CON_SHIFT, .sel_shift = CLK_SPI2_PLL_SEL_SHIFT, }, - [3] = { .reg = 60, + [4] = { .reg = 60, .div_shift = CLK_SPI4_PLL_DIV_CON_SHIFT, .sel_shift = CLK_SPI4_PLL_SEL_SHIFT, }, - [4] = { .reg = 58, + [5] = { .reg = 58, .div_shift = CLK_SPI5_PLL_DIV_CON_SHIFT, .sel_shift = CLK_SPI5_PLL_SEL_SHIFT, }, }; @@ -656,10 +656,15 @@ static ulong rk3399_spi_get_clk(struct rk3399_cru *cru, ulong clk_id) u32 div, val; switch (clk_id) { - case SCLK_SPI0 ... SCLK_SPI5: + case SCLK_SPI0: + case SCLK_SPI1: + case SCLK_SPI2: + case SCLK_SPI4: + case SCLK_SPI5: spiclk = &spi_clkregs[clk_id - SCLK_SPI0]; break; + case SLCK_SPI3: default: error("%s: SPI clk-id %ld not supported\n", __func__, clk_id); return -EINVAL; @@ -680,10 +685,15 @@ static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz) assert(src_clk_div < 127); switch (clk_id) { - case SCLK_SPI1 ... SCLK_SPI5: + case SCLK_SPI0: + case SCLK_SPI1: + case SCLK_SPI2: + case SCLK_SPI4: + case SCLK_SPI5: spiclk = &spi_clkregs[clk_id - SCLK_SPI0]; break; + case SLCK_SPI3: default: error("%s: SPI clk-id %ld not supported\n", __func__, clk_id); return -EINVAL; -- 2.1.4

3 3

[U-Boot] [PATCH 6/6 v4] x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobs
by Stefan Roese 06 Aug '17

06 Aug '17

This defconfig uses the PCIe x4 binary blobs from the congatec BIOS. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- v4: - Remove Gigadevice and Macronix flash support v3: - New patch board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 1 + ...eadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 57 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig diff --git a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS index 6e065590ab..cceda4f49f 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS @@ -7,4 +7,5 @@ F: include/configs/theadorable-x86-conga-qa3-e3845.h F: configs/conga-qeval20-qa3-e3845_defconfig F: configs/conga-qeval20-qa3-e3845-internal-uart_defconfig F: configs/theadorable-x86-conga-qa3-e3845_defconfig +F: configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig F: arch/x86/dts/conga-qeval20-qa3-e3845.dts diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig new file mode 100644 index 0000000000..fe55a78014 --- /dev/null +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -0,0 +1,57 @@ +CONFIG_X86=y +CONFIG_VENDOR_CONGATEC=y +CONFIG_TARGET_THEADORABLE_X86_CONGA_QA3_E3845=y +CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845" +CONFIG_INTERNAL_UART=y +CONFIG_FLASH_DESCRIPTOR_FILE="descriptor-pcie-x4.bin" +CONFIG_SMP=y +CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffa0000 +CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_MP_TABLE=y +CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y +CONFIG_SEABIOS=y +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_CPU=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_GPIO=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_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_ISO_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CPU=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_INTEL=y +CONFIG_WINBOND_W83627=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_E1000=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CONSOLE_SCROLL_LINES=5 -- 2.14.0

1 0

[U-Boot] [PATCH 2/6 v4] x86: conga: Add option to select different config headers for baseboards
by Stefan Roese 06 Aug '17

06 Aug '17

This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- v4: - Remove Gigadevice and Macronix flash support v3: - Rebased on latest master - Removed unused macros from config headers v2: - Added Bin's reviewed-by board/congatec/Kconfig | 11 +++++ board/congatec/conga-qeval20-qa3-e3845/Kconfig | 7 +-- board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS | 2 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 56 ++++++++++++++++++++++ include/configs/theadorable-x86-conga-qa3-e3845.h | 38 +++++++++++++++ 5 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h diff --git a/board/congatec/Kconfig b/board/congatec/Kconfig index ff5a1d84a1..fb341bf24c 100644 --- a/board/congatec/Kconfig +++ b/board/congatec/Kconfig @@ -24,6 +24,17 @@ config TARGET_CONGA_QEVAL20_QA3_E3845 Note that PCIE_ECAM_BASE is set up by the FSP so the value used by U-Boot matches that value. +config TARGET_THEADORABLE_X86_CONGA_QA3_E3845 + bool "theadorable-x86 baseboard & conga-QA3/E3845" + help + This is the theadorable-x86 baseboard board equipped with the + conga-QA3/E3845-4G SoM. It contains an Atom E3845 with Ethernet, + micro-SD, USB 2, USB 3, SATA, serial console and HDMI 1.3 video + out. It requires some binary blobs - see README.x86 for details. + + Note that PCIE_ECAM_BASE is set up by the FSP so the value used + by U-Boot matches that value. + endchoice source "board/congatec/conga-qeval20-qa3-e3845/Kconfig" diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig index c2649d299f..a3673a66bd 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig +++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig @@ -1,5 +1,3 @@ -if TARGET_CONGA_QEVAL20_QA3_E3845 - config SYS_BOARD default "conga-qeval20-qa3-e3845" @@ -10,7 +8,8 @@ config SYS_SOC default "baytrail" config SYS_CONFIG_NAME - default "conga-qeval20-qa3-e3845" + default "conga-qeval20-qa3-e3845" if TARGET_CONGA_QEVAL20_QA3_E3845 + default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845 config SYS_TEXT_BASE default 0xfff00000 if !EFI_STUB @@ -27,5 +26,3 @@ config BOARD_SPECIFIC_OPTIONS # dummy config PCIE_ECAM_BASE default 0xe0000000 - -endif diff --git a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS index 3d7e8e2d61..6e065590ab 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS @@ -3,6 +3,8 @@ M: Stefan Roese <sr(a)denx.de> S: Maintained F: board/congatec/conga-qeval20-qa3-e3845 F: include/configs/conga-qeval20-qa3-e3845.h +F: include/configs/theadorable-x86-conga-qa3-e3845.h F: configs/conga-qeval20-qa3-e3845_defconfig F: configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +F: configs/theadorable-x86-conga-qa3-e3845_defconfig F: arch/x86/dts/conga-qeval20-qa3-e3845.dts diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig new file mode 100644 index 0000000000..9d6dc9453c --- /dev/null +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -0,0 +1,56 @@ +CONFIG_X86=y +CONFIG_VENDOR_CONGATEC=y +CONFIG_TARGET_THEADORABLE_X86_CONGA_QA3_E3845=y +CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845" +CONFIG_INTERNAL_UART=y +CONFIG_DEBUG_UART=y +CONFIG_SMP=y +CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffa0000 +CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_MP_TABLE=y +CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y +CONFIG_SEABIOS=y +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_CPU=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_GPIO=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_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CPU=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_INTEL=y +CONFIG_WINBOND_W83627=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_E1000=y +CONFIG_DEBUG_UART_BASE=0x3f8 +CONFIG_DEBUG_UART_CLOCK=1843200 +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_FRAMEBUFFER_VESA_MODE_114=y +CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h new file mode 100644 index 0000000000..17aee1a0d2 --- /dev/null +++ b/include/configs/theadorable-x86-conga-qa3-e3845.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * 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_PREBOOT + +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" + +#define VIDEO_IO_OFFSET 0 +#define CONFIG_X86EMU_RAW_IO +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP + +/* Environment settings */ +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#undef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x006ec000 +#define CONFIG_ENV_OFFSET_REDUND \ + (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) + +#endif /* __CONFIG_H */ -- 2.14.0

1 0

[U-Boot] [PATCH v3 0/9] spl: dm: Make it possible for the SPL to pick its own DTB from a FIT
by Jean-Jacques Hiblot 06 Aug '17

06 Aug '17

Following the RFC, here is the series implementing the mechanism in a cleaner way. The idea is that the SPL may take advantage of selecting its DTB from a pool of available DTBs. To do that several DTBs are embedded in a compressed FIT image appended at the end of the SPL. The patch is done in such way that this mechanism can easily be extended to other ways of loading the DTBs. Here are some numbers: +----------------------------------------+ | Size |delta |boot-time| delta | | (bytes) |(bytes) |(ms) | (ms) | +---------------------------------------------------------------+ | reference | 120185 | | 1331 | | +---------------------------------------------------------------+ | feature | | | | | | deactiVated | 120185 | 0 | 1330 | -1 | +---------------------------------------------------------------+ | 1 DTB LZO | 120208 | 23 | 1331 | 0 | +---------------------------------------------------------------+ | 4 DTB LZO | 120810 | 625 | 1336 | 5 | +---------------------------------------------------------------+ | 4 DTB LZO | | | | | | no malloc | 120746 | 561 | 1343 | 12 | +---------------------------------------------------------------+ | 4 DTB GZIP | 128552 | 8367 | 1353 | 22 | +---------------------------------------------------------------+ | 4 DTB No comp | 132352 | 12167 | 1351 | 20 | +----------------------+----------+----------+---------+--------+ changes since v2: - rebased on u-boot/master - improved help in Kconfig for the compression options in SPL - improved commit message for patch #1 - Added some comments to describe locate_dtb_in_fit() and fit_find_config_node() - Added a description of the mecanism in a README changes since v1: - improved help in Kconfig for the SPL_MULTI_DTB_FIT option - Added "reviewed-by" tags changes since RFC: - split the RFC patch in several patches. - leverage work from Cooper Jr., Franklin (CONFIG_FIT_EMBED) as a big part of the code is similar. Rename CONFIG_FIT_EMBED as CONFIG_MULTI_DTB_FIT to prevent confusion with CONFIG_OF_EMBED. - use the default configuration if no match is provided by board_fit_config_name_match(). note that this is generic not just for this feature. - provide an option to not use dynamic memory allocation. - added a patch related to board detection on omap that's required to take advantage of this feature. Jean-Jacques Hiblot (9): dts: renamed FIT_EMBED to MULTI_DTB_FIT and moved it to the dts Kconfig fit: use 'const' for the input of fdt_offset() and locate_dtb_in_fit() fit: fixed bug in locate_dtb_in_fit() fit: If no matching config is found in fit_find_config_node(), use the default one lzo: add a function to check the validity of the header gzip: add a function to parse the header lib: allow building lzo and gunzip for the SPL spl: dm: Make it possible for the SPL to pick its own DTB from a FIT omap: detect board before spl_early_init() Makefile | 2 +- arch/arm/mach-omap2/hwinit-common.c | 4 +- board/ti/ks2_evm/board_k2e.c | 2 +- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/ks2_evm/board_k2hk.c | 2 +- board/ti/ks2_evm/board_k2l.c | 2 +- common/Kconfig | 16 ------ common/Makefile | 2 +- common/boot_fit.c | 6 +-- common/common_fit.c | 20 +++++++ configs/k2e_evm_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/k2hk_evm_defconfig | 2 +- configs/k2l_evm_defconfig | 2 +- doc/README.multi-dtb-fit | 49 +++++++++++++++++ dts/Kconfig | 103 +++++++++++++++++++++++++++++++++++- include/boot_fit.h | 9 +++- include/common.h | 1 + include/image.h | 13 +++++ include/linux/lzo.h | 3 ++ lib/Kconfig | 17 +++++- lib/Makefile | 6 +-- lib/fdtdec.c | 85 +++++++++++++++++++++++++---- lib/gunzip.c | 15 ++++-- lib/lzo/lzo1x_decompress.c | 21 ++++++-- scripts/Makefile.spl | 35 +++++++++++- 26 files changed, 369 insertions(+), 54 deletions(-) create mode 100644 doc/README.multi-dtb-fit -- 1.9.1

2 13

[U-Boot] [PATCH 1/5] dm: ofnode: use ofnode_read_bool() to check property existence
by Masahiro Yamada 06 Aug '17

06 Aug '17

This will clarify the code. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/core/ofnode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index ac312d654654..b8b16bf5e275 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -556,22 +556,22 @@ int ofnode_read_size_cells(ofnode node) bool ofnode_pre_reloc(ofnode node) { - if (ofnode_read_prop(node, "u-boot,dm-pre-reloc", NULL)) + if (ofnode_read_bool(node, "u-boot,dm-pre-reloc")) return true; #ifdef CONFIG_TPL_BUILD - if (ofnode_read_prop(node, "u-boot,dm-tpl", NULL)) + if (ofnode_read_bool(node, "u-boot,dm-tpl")) return true; #elif defined(CONFIG_SPL_BUILD) - if (ofnode_read_prop(node, "u-boot,dm-spl", NULL)) + if (ofnode_read_bool(node, "u-boot,dm-spl")) return true; #else /* * In regular builds individual spl and tpl handling both * count as handled pre-relocation for later second init. */ - if (ofnode_read_prop(node, "u-boot,dm-spl", NULL) || - ofnode_read_prop(node, "u-boot,dm-tpl", NULL)) + if (ofnode_read_bool(node, "u-boot,dm-spl") || + ofnode_read_bool(node, "u-boot,dm-tpl")) return true; #endif -- 2.7.4

3 20

[U-Boot] [PATCH v2 0/7] efi_loader: event services
by Heinrich Schuchardt 06 Aug '17

06 Aug '17

Currently U-Boot only allows a single event. This is sufficient to run grub but not for other workloads as iPXE. The EFI_SIMPLE_TEXT_INPUT_PROTOCOL requires an event WaitForKey. This is used for instance by the iPXE shell. The 1st patch replaces void * by struct efi_event * where applicable. This renders the code more readable. The 2nd patch implements the support for multiple events. The 3rd patch corrects the size of the tpl level function parameters to match UINTN. The 4th patch makes efi_create_event internally callable. The 5th patch makes efi_set_timer internally callable. The 6th patch sets up events to track console input and to signal this to the WaitForKey event. The 7th patch implements the conversion of multiples of 100ns to multiples of 1000 ns in efi_set_timer. --- v2 Patches 1, 3, 4, 5, 7 are new. A patch to silence debug output for WaitForKey has been dropped. Patches 2 and 6 are completely reworked compared to v1 of the patch series. Multiple events in WaitForEvent are addressed. The serial console handling is move to dynamically allocated events. --- Heinrich Schuchardt (7): efi_loader: use struct efi_event * instead of void * efi_loader: implement multiple event support efi_loader: correct size for tpl level efi_loader: refactor efi_create_event efi_loader: refactor efi_set_timer efi_console: set up events efi_loader: correctly implement 100ns conversion cmd/bootefi.c | 1 + include/efi_api.h | 44 ++++--- include/efi_loader.h | 39 +++++- lib/efi_loader/efi_boottime.c | 298 +++++++++++++++++++++++++++++------------- lib/efi_loader/efi_console.c | 40 +++++- 5 files changed, 316 insertions(+), 106 deletions(-) -- 2.13.2

3 12

[U-Boot] Enc: Uboot compatible with board Tegra124-nyan-big (ChromeBook G3 HP 14")
by Alexandre N. Perfeito 06 Aug '17

06 Aug '17

Uboot List, Someone could help me as I wrap up this to solve my problem. Best Regards Perfeito, Alexander ________________________________ De: Alexandre N. Perfeito <perfeitoan(a)hotmail.com> Enviado: segunda-feira, 24 de julho de 2017 18:35 Para: Thomas Hoff Cc: Simon Glass Assunto: Re: [U-Boot] Uboot compatible with board Tegra124-nyan-big (ChromeBook G3 HP 14") HI Thomas, First of all thanks. I not using SDcard. But this help some way check this out below: My USB 32 G is partioned like this: cgpt add -i 6 -b 64 -s 32768 -S 1 -P 5 -l KERN-A -t "kernel" /dev/sda6 --> 16 MB Space The MAIN TIP I ASK FOR cgpt add -i 7 -b 65600 -s $aroot_size -l ROOT-A -t "rootfs" /dev/sda7 --> 29.3GBSpace Roofs with (Ubunut Xenial Installed) and running chroot OK See the information about the device USB: /dev/sda6: PARTLABEL="KERN-A" PARTUUID="d43b02e7-af2d-3642-93d8-370d84193655" /dev/sda7: UUID="4100d9e3-55b9-4ce2-9312-117932369684" TYPE="ext4" PARTLABEL="ROOT-A" PARTUUID="a01d12a1-c0e2-d54c-b68a-6e24e3896ae2" How I do to put this information you give me Below in e-mail before: to you would boot a kernel from an ***sdcard that had uImage and tegra124-nyan-big.dtb in ***ext2 formatted partition on ***/dev/mmcblk1p3 ***mmc dev 1 ; mmc rescan 1 ; ext2load mmc 1:3 0x81000000 uImage ; ext2load mmc 1:3 0x82000000 tegra124-nyan-big.dtb ; bootm 0x81000000 - 0x82000000 Because I using the sugestion 1 I did describe in e-mail below with Uboot and Kernel 3.10.x.x run like a charm. *** Information to adapt for USB botting How I do to Kernel 4.4.x.x Best Regards Perfeito , Alexander ________________________________ De: Thomas Hoff <thomashoffltd(a)gmail.com> Enviado: segunda-feira, 24 de julho de 2017 17:53 Para: Simon Glass Cc: Alexandre N. Perfeito; u-boot(a)lists.denx.de Assunto: Re: [U-Boot] Uboot compatible with board Tegra124-nyan-big (ChromeBook G3 HP 14") Hey Alexandre, Here is a link to a precompiled and signed non verified uboot for the nyan-big chromebook: https://drive.google.com/file/d/0B3uMpbwOyYIadEtPdVpHV1piWEU/view?usp=shari… This is how you would boot a kernel from an sdcard that had uImage and tegra124-nyan-big.dtb in ext2 formatted partition on /dev/mmcblk1p3 mmc dev 1 ; mmc rescan 1 ; ext2load mmc 1:3 0x81000000 uImage ; ext2load mmc 1:3 0x82000000 tegra124-nyan-big.dtb ; bootm 0x81000000 - 0x82000000 Hope that helps On Fri, Jul 21, 2017 at 3:48 AM, Simon Glass <sjg(a)chromium.org<mailto:sjg@chromium.org>> wrote: Hi Alexandre, [...] >> Hi , My Name is Alexander and i need some tip information about U-boot >> Board Nyan-Big to runinng Linux v4.4.x.x. > > Can you please resend this to the U-Boot mailing list and cc me? > > Thanks, > Simon >> >> >> I compiled source 4.4.0.70 Ubuntu distribution in chroot environment in my >> chormebook Tegra Tk1. >> After compilation the generated files were the following: >> >> >> >> [aperfeito@alarm boot]$ ls -l >> total 24992 >> -rw-r--r-- 1 root root 98874 Jul 13 14:54 config-4.4.70-ARCH >> -rw-r--r-- 1 root root 8277506 Jul 13 14:54 initrd.img-4.4.70-ARCH >> -rw-r--r-- 1 root root 2033244 Jul 13 14:54 System.map-4.4.70-ARCH >> -rw-r--r-- 1 root root 15175680 Jul 13 14:54 vmlinuz-4.4.70-ARCH >> >> I also compiled the u-boot-tegra in the same environment in chroot Ubuntu >> Xenial distribution these were compiled according to the email of Tom Warren >> send before >> >> Make 'nyan-big_defconfig' and everything ok as you see below the >> generated files: >> >> >> [aperfeito@alarm u-boot-tegra]$ ls *.bin >> u-boot.bin u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin >> u-boot-dtb.bin u-boot-nodtb.bin u-boot-tegra.bin >> >> Now is the tip I'm asking you: >> I have two suggestions on how to put this in the KERNEL partition of my >> USB. >> My USB has two partitions >> To 1st. KERNEL Name with 16 megabytes of space dev / sda6 >> A 2st. ROOFS Name approximately 29 Gigabytes of space where I worked >> to compile the UbuntuXenial and Uboot-Tegra srcs kernel as you see in the >> email. >> >> >> Sugestion : 1 >> mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg >> dd if=/dev/zero of=bootloader.bin bs=512 count=1 >> vbutil_kernel \ >> --pack vmlinux.kpart \ >> --version 1 \ >> --vmlinuz vmlinux.uimg \ >> --arch arm \ >> --keyblock kernel.keyblock \ --> How I do This if necessary >> --signprivate kernel_data_key.vbprivk \ --> How I do This if >> necessary >> --config cmdline \ --> TXT file whit this config below >> --bootloader bootloader.bin >> >> kernel.its adjust to files below as given to te src kernel 4.4.0-70 >> ./arch/arm/boot/dts/tegra124-nyan-blaze.dtb >> ./arch/arm/boot/dts/tegra124-nyan-big.dtb >> ___________________________________________________TXT CONFIG FILE >> __________________________________________________ >> console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw >> noinitrd lsm.module_locking=0 ## OR ### >> initrd=/boot/initrd.img-4.4.0-ARCH console=ttyS0,115200n8 console=tty1 >> ignore_loglevel earlyprintk cgroup_enable=memory root=/dev/sda7 >> >> >> ### For config line need your sugestion with is the best. >> >> >> Sugestion: 2 >> >> I have to copy the kernel, generated initramfs, and dtb to the SDA6 >> partition and added the following kernel config to /dev/sda7/roofsparttion >> :/boot/extlinux/extlinux.conf >> >> LABEL UbuntuXenial >> MENU LABEL UbuntuXenial on sda7 with 4.4 kernel >> LINUX /boot/vmlinuz-4.4.0 >> FDT /boot/dtb/tegra124-nyan-big.dtb >> APPEND initrd=/boot/initrd.img-4.4.0-ARCH console=ttyS0,115200n8 >> console=tty1 ignore_loglevel earlyprintk cgroup_enable=memory root=/dev/sda7 >> >> >> >> How to make U-boot-Tegra now Work with Kernel 4.4.x.x as v3.10.x.x Kernels >> booting on USB. There is a series which shows how to do this for tegra and rockchip. It is at u-boot-dm/chain-working and you can find a README there as well. The series has not been applied yet - I think it is in Tom Warren's queue? Regards, Simon [...] _______________________________________________ U-Boot mailing list U-Boot(a)lists.denx.de<mailto:U-Boot@lists.denx.de> https://lists.denx.de/listinfo/u-boot

2 1