November 2016 - U-Boot

[U-Boot] arch/arm/mach-sunxi/dram_sun8i_a33.c and 1Gb detect as 512Mb on A33.
by far5893 27 Nov '16

27 Nov '16

I have a tablet with 1Gb of ram (two chips),but not u-boot neither kernel detect it (only 512Mb). Does i need to change something in arch/arm/mach-sunxi/dram_sun8i_a33.c ? i posta alettronica found this struct in sunxi_dram_init(void) function: struct dram_para para = { .cs1 = 0, .bank = 1, .rank = 1, .rows = 15, .bus_width = 16, .page_size = 2048, }; Thanks

1 0

[U-Boot] [PATCH 00/97] Replace some powerpc CONFIG_* macros to Kconfig options
by york sun 27 Nov '16

27 Nov '16

This set converts all CONFIG_PPC_* SoC macros to Kconfig ARCH_* options and drop existing macros. CONFIG_MAX_CPUS is converted to Kconfig option for mpc85xx, and dropped for mpc86xx. York

2 1

[U-Boot] [PATCH 00/19] imx: add i.MX6SLL support
by Peng Fan 27 Nov '16

27 Nov '16

This patch set is to add i.MX6SLL support. 1. There are also a few patches to fix bugs in this patchset. 2. Default add device tree support. 3. Add two defconfigs, one for DCD, the other for plugin. Peng Fan (19): imx: add i.MX 6SLL CPU type imx: mx6sll: add pinmux header files imx: mx6sll: update register address imx-common: timer: add i.MX6SLL support imx: mx6sll: add iomux settings imx: mx6: fix mmdc ch0 clk for 6SL imx: mx6: lcdif: gate clock before changing mux imx: mx6sl: add lcdif clock support imx: clock: gate clk before changing pix clk mux imx: mx6sll: add clock support imx-common: cache: configure L2 Cache for i.MX6SLL imx: mx6sll: add Kconfig entry for i.MX6SLL mx6_common: correct loadaddr and text base for i.MX6SLL OCOTP: Update OCOTP driver to support i.MX6SLL imx-common: lcdif: update lcdif regs for i.MX6SL/SLL pinctrl: imx6: support i.MX6SLL arm: dts: add i.MX6SLL device tree arm: imx: add i.MX6SLL EVK board support imx: mx6sllevk: add plugin support arch/arm/cpu/armv7/mx6/Kconfig | 11 + arch/arm/cpu/armv7/mx6/clock.c | 143 ++- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6sll-evk.dts | 801 ++++++++++++++++ arch/arm/dts/imx6sll-pinfunc.h | 882 ++++++++++++++++++ arch/arm/dts/imx6sll.dtsi | 859 +++++++++++++++++ arch/arm/imx-common/cache.c | 17 +- arch/arm/imx-common/cpu.c | 2 + arch/arm/imx-common/iomux-v3.c | 10 +- arch/arm/imx-common/timer.c | 10 +- arch/arm/include/asm/arch-imx/cpu.h | 3 +- arch/arm/include/asm/arch-mx6/clock.h | 2 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 21 + arch/arm/include/asm/arch-mx6/imx-regs.h | 76 +- arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 + arch/arm/include/asm/arch-mx6/mx6sll_pins.h | 1019 +++++++++++++++++++++ arch/arm/include/asm/imx-common/iomux-v3.h | 6 +- arch/arm/include/asm/imx-common/regs-lcdif.h | 7 +- arch/arm/include/asm/imx-common/sys_proto.h | 1 + board/freescale/mx6sllevk/Kconfig | 12 + board/freescale/mx6sllevk/Makefile | 6 + board/freescale/mx6sllevk/imximage.cfg | 127 +++ board/freescale/mx6sllevk/mx6sllevk.c | 131 +++ board/freescale/mx6sllevk/plugin.S | 155 ++++ board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- configs/mx6sllevk_defconfig | 36 + configs/mx6sllevk_plugin_defconfig | 37 + drivers/misc/mxc_ocotp.c | 16 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 + include/configs/mx6_common.h | 3 +- include/configs/mx6sllevk.h | 152 +++ include/dt-bindings/clock/imx6sll-clock.h | 204 +++++ 33 files changed, 4667 insertions(+), 91 deletions(-) create mode 100644 arch/arm/dts/imx6sll-evk.dts create mode 100644 arch/arm/dts/imx6sll-pinfunc.h create mode 100644 arch/arm/dts/imx6sll.dtsi create mode 100644 arch/arm/include/asm/arch-mx6/mx6sll_pins.h create mode 100644 board/freescale/mx6sllevk/Kconfig create mode 100644 board/freescale/mx6sllevk/Makefile create mode 100644 board/freescale/mx6sllevk/imximage.cfg create mode 100644 board/freescale/mx6sllevk/mx6sllevk.c create mode 100644 board/freescale/mx6sllevk/plugin.S create mode 100644 configs/mx6sllevk_defconfig create mode 100644 configs/mx6sllevk_plugin_defconfig create mode 100644 include/configs/mx6sllevk.h create mode 100644 include/dt-bindings/clock/imx6sll-clock.h -- 2.6.2

4 22

[U-Boot] [PATCH v2 0/6] efi_laoder: Add travis test coverage
by Alexander Graf 27 Nov '16

27 Nov '16

Now that we have Travis-CI support in U-Boot as well as a simple hello world efi binary test case, we can make use of the two and verify that efi_loader support still works on every commit. This patch set enables network as well as basic efi_loader test coverage once the uboot-test-hooks pull request at https://github.com/swarren/uboot-test-hooks/pull/9 is accepted. --- v1 -> v2: - Make the tests actually work - New patch: Travis: Expose build dir as variable - New patch: Travis: Remove sleep test from integratorcp_cm926ejs-qemu test Alexander Graf (6): tests: net: Offset downloads to 4MB Travis: Expose build dir as variable travis: Add python path for environments tests: Add efi_loader hello world test efi_loader: Allow to compile helloworld.efi w/o bundling it Travis: Remove sleep test from integratorcp_cm926ejs-qemu test .travis.yml | 7 +- arch/arm/lib/Makefile | 2 +- arch/x86/config.mk | 2 +- arch/x86/lib/Makefile | 2 +- cmd/Kconfig | 15 ++- configs/qemu-x86_efi_payload64_defconfig | 1 + lib/efi_loader/Makefile | 3 + test/py/tests/test_efi_loader.py | 158 +++++++++++++++++++++++++++++++ test/py/tests/test_net.py | 4 +- 9 files changed, 186 insertions(+), 8 deletions(-) create mode 100644 test/py/tests/test_efi_loader.py -- 1.8.5.6

3 31

[U-Boot] Please pull u-boot-rockchip (take 2)
by Simon Glass 26 Nov '16

26 Nov '16

Hi Tom, I fixed up the checking of voltage and current to correct the test failure. Sorry for not spotting this correctly. The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32: MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to 6b388f0bed0e3d021128b4fc3c41da4572984e3b: rockchip: configs: correct partitions 'boot' size (2016-11-25 17:59:32 -0700) ---------------------------------------------------------------- Andreas Färber (2): arm: dts: Fix Rockchip sort order arm: rockchip: Fix typo in ROCKCHIP_RK3288 help Jacob Chen (1): rockchip: configs: correct partitions 'boot' size Keerthy (3): power: regulator: Introduce regulator_set_value_force function power: regulator: Add limits checking while setting voltage power: regulator: Add limits checking while setting current Kever Yang (5): evb-rk3399: deduced the dram node size when space reserved config: evb-rk3399: enable PWM_ROCKCHIP config: rk3036: enable configs for USB HOST config: rk3036: enable fix regulator dts: arm: rk3036: add usb vbus node Simon Glass (21): rockchip: video: Correct HDMI data source selection rockchip: video: Correct VOP clock selection rockchip: Allow jerry to use of-platdata stdio: Correct code style nits stdio: Correct numbering logic in stdio_probe_device() spi: Add of-platdata support to SPI and SPI flash rockchip: spi: Add support for of-platdata rockchip: spi: Honour the deactivation delay spi: Add a debug() on bind failure video: Use cache-alignment in video_sync() video: Track whether a display is in use rockchip: video: Check for device in use rockchip: Move jerry to use of-platdata rockchip: Rename jerry files to veyron rockchip: veyron: Add a note about the SDRAM voltage rockchip: Move jerry SDRAM settings into its own .dts file rockchip: clk: Support setting ACLK rockchip: veyron: Adjust ARM clock after relocation rockchip: video: Avoid using u8 in the HDMI driver rockchip: Add support for veyron-mickey (Chromebit) rockchip: Add support for veyron-minnie (ASUS Chromebook Flip) arch/arm/dts/Makefile | 6 +- arch/arm/dts/rk3036-sdk.dts | 37 +++- arch/arm/dts/rk3288-veyron-chromebook.dtsi | 2 + arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} | 16 +- arch/arm/dts/rk3288-veyron-mickey.dts | 277 ++++++++++++++++++++++++ arch/arm/dts/rk3288-veyron-minnie.dts | 301 ++++++++++++++++++++++++++ arch/arm/dts/rk3288-veyron.dtsi | 8 - arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 4 + arch/arm/mach-rockchip/rk3288-board.c | 44 ++++ arch/arm/mach-rockchip/rk3288/Kconfig | 21 +- board/google/chromebook_jerry/Kconfig | 15 -- board/google/chromebook_jerry/MAINTAINERS | 6 - board/google/chromebook_jerry/jerry.c | 7 - board/google/veyron/Kconfig | 47 ++++ board/google/veyron/MAINTAINERS | 20 ++ board/google/{chromebook_jerry => veyron}/Makefile | 2 +- board/google/veyron/veyron.c | 13 ++ board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- cmd/regulator.c | 5 +- common/stdio.c | 9 +- configs/chromebit_mickey_defconfig | 84 +++++++ configs/chromebook_jerry_defconfig | 10 +- configs/chromebook_minnie_defconfig | 82 +++++++ configs/evb-rk3399_defconfig | 1 + configs/kylin-rk3036_defconfig | 4 + drivers/clk/rockchip/clk_rk3288.c | 7 + drivers/mtd/spi/spi_flash.c | 2 +- drivers/power/regulator/regulator-uclass.c | 28 +++ drivers/spi/rk_spi.c | 44 +++- drivers/spi/spi-uclass.c | 18 +- drivers/video/display-uclass.c | 18 +- drivers/video/rockchip/rk_hdmi.c | 33 +-- drivers/video/rockchip/rk_vop.c | 16 +- drivers/video/video-uclass.c | 3 +- include/configs/rk3036_common.h | 7 + include/configs/rockchip-common.h | 2 +- include/configs/{chromebook_jerry.h => veyron.h} | 0 include/display.h | 10 + include/power/regulator.h | 10 + 40 files changed, 1133 insertions(+), 90 deletions(-) rename arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} (92%) create mode 100644 arch/arm/dts/rk3288-veyron-mickey.dts create mode 100644 arch/arm/dts/rk3288-veyron-minnie.dts delete mode 100644 board/google/chromebook_jerry/Kconfig delete mode 100644 board/google/chromebook_jerry/MAINTAINERS delete mode 100644 board/google/chromebook_jerry/jerry.c create mode 100644 board/google/veyron/Kconfig create mode 100644 board/google/veyron/MAINTAINERS rename board/google/{chromebook_jerry => veyron}/Makefile (81%) create mode 100644 board/google/veyron/veyron.c create mode 100644 configs/chromebit_mickey_defconfig create mode 100644 configs/chromebook_minnie_defconfig rename include/configs/{chromebook_jerry.h => veyron.h} (100%) Regards, Simon

2 1

[U-Boot] Please pull u-boot-rockchip
by Simon Glass 26 Nov '16

26 Nov '16

Hi Tom, This includes support for minnie and mickey Chromebooks, rk3036 USB support, some power improvements and other minor things. The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32: MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to fc334a074b7309e08c8bbbbf9571f4e5025f345a: rockchip: configs: correct partitions 'boot' size (2016-11-25 10:03:32 -0700) ---------------------------------------------------------------- Andreas Färber (2): arm: dts: Fix Rockchip sort order arm: rockchip: Fix typo in ROCKCHIP_RK3288 help Jacob Chen (1): rockchip: configs: correct partitions 'boot' size Keerthy (3): power: regulator: Introduce regulator_set_value_force function power: regulator: Add limits checking while setting voltage power: regulator: Add limits checking while setting current Kever Yang (5): evb-rk3399: deduced the dram node size when space reserved config: evb-rk3399: enable PWM_ROCKCHIP config: rk3036: enable configs for USB HOST config: rk3036: enable fix regulator dts: arm: rk3036: add usb vbus node Simon Glass (21): rockchip: video: Correct HDMI data source selection rockchip: video: Correct VOP clock selection rockchip: Allow jerry to use of-platdata stdio: Correct code style nits stdio: Correct numbering logic in stdio_probe_device() spi: Add of-platdata support to SPI and SPI flash rockchip: spi: Add support for of-platdata rockchip: spi: Honour the deactivation delay spi: Add a debug() on bind failure video: Use cache-alignment in video_sync() video: Track whether a display is in use rockchip: video: Check for device in use rockchip: Move jerry to use of-platdata rockchip: Rename jerry files to veyron rockchip: veyron: Add a note about the SDRAM voltage rockchip: Move jerry SDRAM settings into its own .dts file rockchip: clk: Support setting ACLK rockchip: veyron: Adjust ARM clock after relocation rockchip: video: Avoid using u8 in the HDMI driver rockchip: Add support for veyron-mickey (Chromebit) rockchip: Add support for veyron-minnie (ASUS Chromebook Flip) arch/arm/dts/Makefile | 6 +- arch/arm/dts/rk3036-sdk.dts | 37 +++- arch/arm/dts/rk3288-veyron-chromebook.dtsi | 2 + arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} | 16 +- arch/arm/dts/rk3288-veyron-mickey.dts | 277 ++++++++++++++++++++++++ arch/arm/dts/rk3288-veyron-minnie.dts | 301 ++++++++++++++++++++++++++ arch/arm/dts/rk3288-veyron.dtsi | 8 - arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 4 + arch/arm/mach-rockchip/rk3288-board.c | 44 ++++ arch/arm/mach-rockchip/rk3288/Kconfig | 21 +- board/google/chromebook_jerry/Kconfig | 15 -- board/google/chromebook_jerry/MAINTAINERS | 6 - board/google/chromebook_jerry/jerry.c | 7 - board/google/veyron/Kconfig | 47 ++++ board/google/veyron/MAINTAINERS | 20 ++ board/google/{chromebook_jerry => veyron}/Makefile | 2 +- board/google/veyron/veyron.c | 13 ++ board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- cmd/regulator.c | 5 +- common/stdio.c | 9 +- configs/chromebit_mickey_defconfig | 84 +++++++ configs/chromebook_jerry_defconfig | 10 +- configs/chromebook_minnie_defconfig | 82 +++++++ configs/evb-rk3399_defconfig | 1 + configs/kylin-rk3036_defconfig | 4 + drivers/clk/rockchip/clk_rk3288.c | 7 + drivers/mtd/spi/spi_flash.c | 2 +- drivers/power/regulator/regulator-uclass.c | 24 ++ drivers/spi/rk_spi.c | 44 +++- drivers/spi/spi-uclass.c | 18 +- drivers/video/display-uclass.c | 18 +- drivers/video/rockchip/rk_hdmi.c | 33 +-- drivers/video/rockchip/rk_vop.c | 16 +- drivers/video/video-uclass.c | 3 +- include/configs/rk3036_common.h | 7 + include/configs/rockchip-common.h | 2 +- include/configs/{chromebook_jerry.h => veyron.h} | 0 include/display.h | 10 + include/power/regulator.h | 10 + 40 files changed, 1129 insertions(+), 90 deletions(-) rename arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} (92%) create mode 100644 arch/arm/dts/rk3288-veyron-mickey.dts create mode 100644 arch/arm/dts/rk3288-veyron-minnie.dts delete mode 100644 board/google/chromebook_jerry/Kconfig delete mode 100644 board/google/chromebook_jerry/MAINTAINERS delete mode 100644 board/google/chromebook_jerry/jerry.c create mode 100644 board/google/veyron/Kconfig create mode 100644 board/google/veyron/MAINTAINERS rename board/google/{chromebook_jerry => veyron}/Makefile (81%) create mode 100644 board/google/veyron/veyron.c create mode 100644 configs/chromebit_mickey_defconfig create mode 100644 configs/chromebook_minnie_defconfig rename include/configs/{chromebook_jerry.h => veyron.h} (100%) Regards, Simon

2 2

[U-Boot] Please pull u-boot-fdt
by Simon Glass 26 Nov '16

26 Nov '16

Hi Tom. The following changes since commit 543bd27353d2c5679057fe09aa2d02259687ff32: MAINTAINERS: SUNXI: Update maintainership (2016-11-22 09:07:26 -0500) are available in the git repository at: git://git.denx.de/u-boot-fdt.git for you to fetch changes up to 643f8d4c07788f28ad283e3fcb29d88a4b16a4be: MAINTAINERS: Fix syntax and update filename for FDT (2016-11-25 09:48:09 -0700) ---------------------------------------------------------------- Andreas Färber (1): MAINTAINERS: Fix syntax and update filename for FDT MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Regards, Simon

2 2

[U-Boot] [PATCH] armv8/spin_table.c: fix spin table release address
by Tsung-Han Lin 26 Nov '16

26 Nov '16

Since only the master core will relocate itself, the spin-table release address seen by master core and other slave cores is different. This commit fixes this issue by recalculating the spin-table release address' offset instead of leaving it to compiler. Signed-off-by: Tsung-Han Lin <tsunghan.tw(a)gmail.com> --- arch/arm/cpu/armv8/spin_table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c index ec1c9b8ddb6f..1169e2df5f47 100644 --- a/arch/arm/cpu/armv8/spin_table.c +++ b/arch/arm/cpu/armv8/spin_table.c @@ -11,12 +11,16 @@ int spin_table_update_dt(void *fdt) { + extern unsigned long _start; int cpus_offset, offset; const char *prop; int ret; unsigned long rsv_addr = (unsigned long)&spin_table_reserve_begin; unsigned long rsv_size = &spin_table_reserve_end - &spin_table_reserve_begin; + unsigned long unreloc_spin_release_addr = CONFIG_SYS_TEXT_BASE + + (unsigned long)&spin_table_cpu_release_addr - + (unsigned long)&_start; cpus_offset = fdt_path_offset(fdt, "/cpus"); if (cpus_offset < 0) @@ -47,7 +51,7 @@ int spin_table_update_dt(void *fdt) continue; ret = fdt_setprop_u64(fdt, offset, "cpu-release-addr", - (unsigned long)&spin_table_cpu_release_addr); + unreloc_spin_release_addr); if (ret) return -ENOSPC; } -- 2.7.4

2 2

[U-Boot] u-boot 2016.11 and A33 1G ram detection.
by 8001010 26 Nov '16

26 Nov '16

Uboot reports 512Mb on my ET_Q8_V2.0 allwinner A33 tablet but it have 1G Ram (android and my eyes on pcb see it!), kernel(4.9-rc6) report 512Mb too. Is ram autodetected or i can change something in dts(i suppose) to permit correct detection? Uboot pass to kernel ram size or kernel detect itself ? Thank

1 0

[U-Boot] [PATCH v2] libfdt: replace ARCH_FIXUP_FDT with ARCH_FIXUP_FDT_MEMORY
by Masahiro Yamada 26 Nov '16

26 Nov '16

Commit e2f88dfd2d96 ("libfdt: Introduce new ARCH_FIXUP_FDT option") allows us to skip memory setup of DTB, but a problem for ARM is that spin_table_update_dt() and psci_update_dt() are skipped as well if CONFIG_ARCH_FIXUP_FDT is disabled. This commit allows us to skip only fdt_fixup_memory_banks() instead of the whole of arch_fixup_fdt(). It will be useful when we want to use a memory node from a kernel DTB as is, but need some fixups for Spin-Table/PSCI. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Add empty stub to ARC, PowerPC, Microblaze instead of a weak function common/image-fdt.c Kconfig | 5 ++--- arch/arc/lib/bootm.c | 5 +++++ arch/arm/lib/bootm-fdt.c | 2 -- arch/arm/lib/bootm.c | 2 -- arch/microblaze/lib/bootm.c | 5 +++++ arch/mips/lib/bootm.c | 2 -- arch/powerpc/lib/bootm.c | 5 +++++ common/fdt_support.c | 2 ++ common/image-fdt.c | 2 -- include/fdt_support.h | 8 ++++++++ 10 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Kconfig b/Kconfig index 1263d0b..b7cb142 100644 --- a/Kconfig +++ b/Kconfig @@ -324,9 +324,8 @@ config SYS_CLK_FREQ help TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture -config ARCH_FIXUP_FDT - bool "Enable arch_fixup_fdt() call" - depends on ARM || MIPS +config ARCH_FIXUP_FDT_MEMORY + bool "Enable arch_fixup_memory_banks() call" default y help Enable FDT memory map syncup before OS boot. This feature can be diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 04d9d9c..5798149 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -37,6 +37,11 @@ void arch_lmb_reserve(struct lmb *lmb) lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp)); } +int arch_fixup_fdt(void *blob) +{ + return 0; +} + static int cleanup_before_linux(void) { disable_interrupts(); diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index a517550..4481f9e 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -25,7 +25,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { bd_t *bd = gd->bd; @@ -61,4 +60,3 @@ int arch_fixup_fdt(void *blob) return 0; } -#endif diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 53c3141..0e890ce 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -372,10 +372,8 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); if (off < 0) { -#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); -#endif } } #endif diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 3eb3440..2732203 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -17,6 +17,11 @@ DECLARE_GLOBAL_DATA_PTR; +int arch_fixup_fdt(void *blob) +{ + return 0; +} + int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 0c6a4ab..aa0475a 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -253,7 +253,6 @@ static int boot_reloc_fdt(bootm_headers_t *images) #endif } -#ifdef CONFIG_ARCH_FIXUP_FDT int arch_fixup_fdt(void *blob) { #if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT) @@ -265,7 +264,6 @@ int arch_fixup_fdt(void *blob) return 0; #endif } -#endif static int boot_setup_fdt(bootm_headers_t *images) { diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index ef15e7a..17c5ed1 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -38,6 +38,11 @@ static void set_clocks_in_mhz (bd_t *kbd); #define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE (768*1024*1024) #endif +int arch_fixup_fdt(void *blob) +{ + return 0; +} + static void boot_jump_linux(bootm_headers_t *images) { void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6, diff --git a/common/fdt_support.c b/common/fdt_support.c index 0609470..c9f7019 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -381,6 +381,7 @@ void do_fixup_by_compat_u32(void *fdt, const char *compat, do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create); } +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY /* * fdt_pack_reg - pack address and size array into the "reg"-suitable stream */ @@ -459,6 +460,7 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) } return 0; } +#endif int fdt_fixup_memory(void *blob, u64 start, u64 size) { diff --git a/common/image-fdt.c b/common/image-fdt.c index 5454227..e7540be 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -474,12 +474,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: /chosen node create failed\n"); goto err; } -#ifdef CONFIG_ARCH_FIXUP_FDT if (arch_fixup_fdt(blob) < 0) { printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } -#endif if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { diff --git a/include/fdt_support.h b/include/fdt_support.h index 506bc5a..955c121 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -93,7 +93,15 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size); * property will be left untouched. * @return 0 if ok, or -1 or -FDT_ERR_... on error */ +#ifdef CONFIG_ARCH_FIXUP_FDT_MEMORY int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks); +#else +static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], + int banks) +{ + return 0; +} +#endif void fdt_fixup_ethernet(void *fdt); int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, -- 1.9.1

3 6