April 2017 - U-Boot

[U-Boot] [PATCH v2] sun8i_emac: configure PHY reset GPIO via DM
by Philipp Tomsich 07 Apr '17

07 Apr '17

This ports the logic for having a GPIO as a reset-output for the mdio_reset function over from designware.c to the (closely related) sun8i_emac driver. Changes in v2: * use the "snps,"-namespace, as the same node binds to the stmmac (i.e. designware) driver on Linux and the Linux DTS is leading Philipp Tomsich (1): sun8i_emac: configure PHY reset GPIO via DM drivers/net/sun8i_emac.c | 86 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 80 insertions(+), 6 deletions(-) -- 1.9.1

2 3

Re: [U-Boot] [PATCH v6 1/3] arm: dts: update Meson GXBB / Odroid-C2 DT with latest Linux version
by Heinrich Schuchardt 07 Apr '17

07 Apr '17

Hello Heiner, I have tested the patch series described in https://lists.denx.de/pipermail/u-boot/2017-February/281941.html against u-boot 2017.03 on my Odroid C2. I could keep patches 1/3 and 2/3 unchanged. Patch 3/3 had to be adjusted to be applicable. To get my board booting Linux from MMC successfully I needed two extra patches: - enable MMC as boot target in meson-gxbb-common.h - increase CONFIG_SYS_BOOTM_LEN I think enabling MMC as boot target should be part of the patch series. Increasing CONFIG_SYS_BOOTM_LEN should be separate. The patches I used are stored in https://github.com/xypron/u-boot-odroid-c2/ together with my Makefile. Heiner, are you planning to update your patch series? Or should I retest against the next branch of u-boot and submit myself? Best regards Heinrich Schuchardt

1 0

[U-Boot] [PATCH 0/6] trats2: remove the unused codes
by Jaehoon Chung 07 Apr '17

07 Apr '17

Trats2 didn't support the driver-model fully. This patchset is a first step to support driver-model. First, remove the unused codes and functions. Second, enable the configuration relevant to pmic. NOTE: In future, other legacy model will be convert to driver-model. Jaehoon Chung (6): arm: dts: trats2: add the i2c-gpio nodes board: samsung: trats2: remove the board_i2c_init() function configs: trats2: enable CONFIG_DM_I2C_GPIO board: samsung: trats2: remove the unused functions configs: trats2: enable the configuration relevant to PMIC board: samsung: trats2: remove the board_power_init() function arch/arm/dts/exynos4412-trats2.dts | 18 +++++++ board/samsung/trats2/trats2.c | 104 ------------------------------------- configs/trats2_defconfig | 4 ++ 3 files changed, 22 insertions(+), 104 deletions(-) -- 2.10.2

3 8

[U-Boot] Pull request: u-boot-sunix/master
by Jagan Teki 07 Apr '17

07 Apr '17

Hi Tom, Please take this PR. thanks! Jagan. The following changes since commit 11db152246607868f0e74db958947fbf79f28119: Prepare v2017.05-rc1 (2017-04-04 17:53:24 -0400) are available in the git repository at: git://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to e7bd15ea156f2a65d6aba167b9b7cd711caae2e6: sunxi: Add OrangePi PC 2 initial support (2017-04-05 15:03:17 +0530) ---------------------------------------------------------------- Andre Przywara (12): sunxi: fix ACTLR.SMP assembly routine ARM: rename CONFIG_TIMER_CLK_FREQ to COUNTER_FREQUENCY fsl: ls102x: remove redundant GENERIC_TIMER_CLK sunxi: simplify ACTLR.SMP bit set #ifdef sunxi: configs: merge sun9i and sun50i SPL memory definitions sunxi: Kconfig: introduce CONFIG_SUNXI_HIGH_SRAM sunxi: provide ARMv8 mem_map for every ARM64 board SPI: SPL: sunxi: fix 64-bit build sunxi: DRAM: add Allwinner H5 support sunxi: prepare for sharing MACH_SUN8I_H3 config symbol sunxi: introduce Allwinner H5 config option sunxi: Add OrangePi PC 2 initial support arch/arm/Kconfig | 4 + arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- arch/arm/cpu/armv7/nonsec_virt.S | 4 +- arch/arm/cpu/armv7/sunxi/psci.c | 2 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 147 ++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 4 +- arch/arm/include/asm/arch-sunxi/cpu.h | 1 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 4 +- arch/arm/include/asm/arch-sunxi/dram.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 2 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 12 +-- arch/arm/mach-sunxi/clock_sun6i.c | 6 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun8i_h3.c | 97 ++++++++++++++--- arch/arm/mach-sunxi/usb_phy.c | 4 +- board/sunxi/Kconfig | 35 +++++- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 6 +- configs/orangepi_pc2_defconfig | 19 ++++ drivers/mtd/spi/Kconfig | 2 +- drivers/mtd/spi/sunxi_spi_spl.c | 16 +-- drivers/net/sun8i_emac.c | 2 +- drivers/power/Kconfig | 4 +- drivers/usb/host/ehci-sunxi.c | 2 +- include/configs/exynos-common.h | 2 +- include/configs/ls1021aiot.h | 7 +- include/configs/ls1021aqds.h | 7 +- include/configs/ls1021atwr.h | 7 +- include/configs/mx7_common.h | 2 +- include/configs/sun50i.h | 1 - include/configs/sunxi-common.h | 24 ++--- scripts/config_whitelist.txt | 1 - 35 files changed, 342 insertions(+), 99 deletions(-) create mode 100644 arch/arm/dts/sun50i-h5-orangepi-pc2.dts create mode 100644 configs/orangepi_pc2_defconfig

3 3

[U-Boot] [PATCH 0/2] Improve Raspberry Pi mmc writes
by Alex Deymo 07 Apr '17

07 Apr '17

When experimenting with fastboot from U-Boot on the Raspberry Pi 3 we found that the writes to the sdcard are much more slow than when accessing it from the userspace. These two patches speed up the write and allow us to reliably write the sdcard from U-Boot. Alex Deymo (1): mmc: sdhci: Wait for SDHCI_INT_DATA_END when transferring. Jocelyn Bohr (1): mmc: bcm2835_sdhci: Speed up mmc writes. drivers/mmc/bcm2835_sdhci.c | 8 ++++++-- drivers/mmc/sdhci.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) -- 2.12.2.564.g063fe858b8-goog

2 4

[U-Boot] [PATCH v2 00/29] arm: i.MX6: SabreSD: Add dts support
by Jagan Teki 07 Apr '17

07 Apr '17

From: Jagan Teki <jagan(a)amarulasolutions.com> Compared to previous series, this series has full possible dts support for SabreSD DualLite, Quad and Quad Plus. The main intention of this series is to add the dts node step by step and remove the legacy code at the end and to make the full functional dts. Still, need to add DCD code for Duallite and will add it in next version series. Changes for v2: - rebase on master - Added new-patches. Log: ---- U-Boot SPL 2017.03-33713-g76a5404 (Apr 03 2017 - 19:09:15) Trying to boot from MMC1 U-Boot 2017.03-33713-g76a5404 (Apr 03 2017 - 19:09:15 +0530) CPU: Freescale i.MX6QP rev1.0 996 MHz (running at 792 MHz) CPU: Automotive temperature grade (-40C to 125C) at 43C Reset cause: POR Model: Freescale i.MX6 Quad Plus SABRE Smart Device Board Board: MX6-SabreSD DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 PCI: pcie phy link never came up No panel detected: default to Hannstar-XGA Display: Hannstar-XGA (1024x768) In: serial Out: serial Err: serial Net: eth0: ethernet@02188000 Hit any key to stop autoboot: 0 => dm tree Class Probed Name ---------------------------------------- root [ + ] root_driver thermal [ ] |-- imx_thermal simple_bus [ + ] `-- soc simple_bus [ + ] |-- aips-bus@02000000 simple_bus [ ] | |-- spba-bus@02000000 gpio [ + ] | |-- gpio@0209c000 gpio [ + ] | |-- gpio@020a0000 gpio [ + ] | |-- gpio@020a4000 gpio [ + ] | |-- gpio@020a8000 gpio [ + ] | |-- gpio@020ac000 gpio [ + ] | |-- gpio@020b0000 gpio [ + ] | |-- gpio@020b4000 simple_bus [ ] | |-- anatop@020c8000 simple_bus [ ] | |-- snvs@020cc000 pinctrl [ + ] | `-- iomuxc@020e0000 pinconfig [ + ] | `-- imx6qdl-sabresd pinconfig [ + ] | |-- enetgrp pinconfig [ ] | |-- i2c1grp pinconfig [ ] | |-- i2c2grp pinconfig [ ] | |-- i2c3grp pinconfig [ ] | |-- uart1grp pinconfig [ ] | |-- usbotggrp pinconfig [ + ] | |-- usdhc2grp pinconfig [ + ] | |-- usdhc3grp pinconfig [ + ] | `-- usdhc4grp simple_bus [ + ] `-- aips-bus@02100000 usb [ ] |-- usb@02184000 usb [ ] |-- usb@02184200 eth [ + ] |-- ethernet@02188000 mmc [ + ] |-- usdhc@02194000 mmc [ + ] |-- usdhc@02198000 mmc [ + ] |-- usdhc@0219c000 i2c [ ] |-- i2c@021a0000 i2c [ ] |-- i2c@021a4000 pmic [ ] | `-- pfuze100@08 i2c [ ] `-- i2c@021a8000 Tested: UART, MMC, I2C, FEC(with basic ping) thanks! Jagan. Jagan Teki (29): ARM: i.MX6: sabresd: Fix README - s/of=/dev/sdbbs=1K/of=/dev/sdb bs=1K/ ARM: dts: i.MX6: Add imx6qdl-sabresd.dtsi ARM: dts: imx6qdl-sabresd: Add imx6q-sabresd.dts ARM: i.MX6: sabresd: Remove SPL_I2C_SUPPORT ARM: i.MX6Q: sabresd: Add initial devicetree support ARM: dts: imx6qdl-sabresd: Add imx6qp-sabresd.dts ARM: i.MX6QP: sabresd: Add initial devicetree support ARM: i.MX6: sabresd: Move CONFIG_SYS_I2C_MXC to defconfigs ARM: dts: imx6qdl-sabresd: Add I2C node's ARM: dts: imx6qdl-sabresd: Add PMIC pfuze100 node ARM: i.MX6: sabresd: Enable DM_I2C and DM_PMIC ARM: i.MX6: sabresd: defconfig move - CONFIG_USB_EHCI(_MX6) ARM: dts: imx6qdl-sabresd: Add usb host node ARM: dts: imx6qdl-sabresd: Add usb otg node ARM: i.MX6: sabresd: Enable CONFIG_DM_REGULATOR ARM: i.MX6: sabresd: Enable DM_USB ARM: dts: imx6qdl-sabresd: Add FEC node ARM: i.MX6: sabresd: Move CONFIG_FEC_MXC to defconfigs ARM: i.MX6: sabresd: Enable DM_ETH ARM: i.MX6: sabresd: Add dm_gpio_* for backlight ARM: i.MX6: sabresd: Add imx6_pcie_toggle_power ARM: i.MX6: sabresd: Add imx6_pcie_toggle_reset ARM: dts: imx6qdl-sabresd: Add imx6dl-sabresd.dts ARM: i.MX6DL: sabresd: Add initial devicetree support ARM: i.MX6: sabresd: Drop legacy non-fdt code ARM: i.MX6: %s/mx6sabresd/imx6sabresd ARM: i.MX6: sabresd: Move DM_* and OF_CONTROL to arch Kconfig ARM: i.MX6: sabresd: Update README ARM: i.MX6: sabresd: Drop checkboard arch/arm/cpu/armv7/mx6/Kconfig | 10 +- arch/arm/dts/Makefile | 3 + arch/arm/dts/imx6dl-sabresd.dts | 17 + arch/arm/dts/imx6q-sabresd.dts | 21 + arch/arm/dts/imx6qdl-sabresd.dtsi | 235 +++++++++ arch/arm/dts/imx6qp-sabresd.dts | 85 ++++ .../freescale/{mx6sabresd => imx6sabresd}/Kconfig | 4 +- board/freescale/imx6sabresd/MAINTAINERS | 8 + .../freescale/{mx6sabresd => imx6sabresd}/Makefile | 2 +- board/freescale/imx6sabresd/README | 84 ++++ .../mx6sabresd.c => imx6sabresd/imx6sabresd.c} | 538 ++++++++------------- board/freescale/mx6sabresd/MAINTAINERS | 8 - board/freescale/mx6sabresd/README | 103 ---- board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ----- board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 169 ------- ...lsabresd_defconfig => imx6dl_sabresd_defconfig} | 26 +- ...bresd_spl_defconfig => imx6q_sabresd_defconfig} | 13 +- ...qsabresd_defconfig => imx6qp_sabresd_defconfig} | 28 +- include/configs/{mx6sabresd.h => imx6sabresd.h} | 25 +- include/configs/mx6sabre_common.h | 3 +- 20 files changed, 727 insertions(+), 786 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd.dts rename board/freescale/{mx6sabresd => imx6sabresd}/Kconfig (70%) create mode 100644 board/freescale/imx6sabresd/MAINTAINERS rename board/freescale/{mx6sabresd => imx6sabresd}/Makefile (86%) create mode 100644 board/freescale/imx6sabresd/README rename board/freescale/{mx6sabresd/mx6sabresd.c => imx6sabresd/imx6sabresd.c} (79%) delete mode 100644 board/freescale/mx6sabresd/MAINTAINERS delete mode 100644 board/freescale/mx6sabresd/README delete mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg delete mode 100644 board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg rename configs/{mx6dlsabresd_defconfig => imx6dl_sabresd_defconfig} (59%) rename configs/{mx6sabresd_spl_defconfig => imx6q_sabresd_defconfig} (82%) rename configs/{mx6qsabresd_defconfig => imx6qp_sabresd_defconfig} (56%) rename include/configs/{mx6sabresd.h => imx6sabresd.h} (71%) -- 1.9.1

4 38

[U-Boot] [PATCH] rockchip: Print a message when returning to the bootrom
by Simon Glass 06 Apr '17

06 Apr '17

At present if the return to bootrom fails (e.g. because you are not using the Rockchip's bootrom's pointer table in MMC) then the board prints SPL message and hangs. Print a message first if we can, to help in understanding what happened when it hangs. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/arm/include/asm/arch-rockchip/bootrom.h | 9 +++++++-- arch/arm/mach-rockchip/Makefile | 2 ++ arch/arm/mach-rockchip/bootrom.c | 16 ++++++++++++++++ arch/arm/mach-rockchip/save_boot_param.S | 6 +++--- configs/firefly-rk3288_defconfig | 2 +- 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 arch/arm/mach-rockchip/bootrom.c diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h index 79fb1a07ac..92eb8783a3 100644 --- a/arch/arm/include/asm/arch-rockchip/bootrom.h +++ b/arch/arm/include/asm/arch-rockchip/bootrom.h @@ -13,10 +13,15 @@ */ extern u32 SAVE_SP_ADDR; -/* +/** * Hand control back to the bootrom to load another * boot stage. */ -extern void back_to_bootrom(void); +void back_to_bootrom(void); + +/** + * Assembler component for the above (do not call this directly) + */ +void _back_to_bootrom_s(void); #endif diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index 6b251c7e7e..5caecfb2c0 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -4,6 +4,8 @@ # SPDX-License-Identifier: GPL-2.0+ # +obj-y += bootrom.o + ifdef CONFIG_TPL_BUILD obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-tpl.o obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c new file mode 100644 index 0000000000..65f058460e --- /dev/null +++ b/arch/arm/mach-rockchip/bootrom.c @@ -0,0 +1,16 @@ +/** + * Copyright (c) 2017 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/arch/bootrom.h> + +void back_to_bootrom(void) +{ +#ifdef SPL_LIBGENERIC_SUPPORT + printf("Returning to boot ROM..."); +#endif + _back_to_bootrom_s(); +} diff --git a/arch/arm/mach-rockchip/save_boot_param.S b/arch/arm/mach-rockchip/save_boot_param.S index 85b407b4d3..5e6c8dba13 100644 --- a/arch/arm/mach-rockchip/save_boot_param.S +++ b/arch/arm/mach-rockchip/save_boot_param.S @@ -23,10 +23,10 @@ ENTRY(save_boot_params) ENDPROC(save_boot_params) -.globl back_to_bootrom -ENTRY(back_to_bootrom) +.globl _back_to_bootrom_s +ENTRY(_back_to_bootrom_s) ldr r0, =SAVE_SP_ADDR ldr sp, [r0] mov r0, #0 pop {r1-r12, pc} -ENDPROC(back_to_bootrom) +ENDPROC(_back_to_bootrom_s) diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index b0741d7bd9..f2e079a378 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_FIREFLY_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly" @@ -74,3 +73,4 @@ CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y +CONFIG_SPL_OF_PLATDATA=y -- 2.12.2.715.g7642488e1d-goog

2 3

[U-Boot] [PATCH 01/17] board_f: sandbox: Move setup_ram_buf() to private code
by Simon Glass 06 Apr '17

06 Apr '17

There is no need to have this call in the generic init sequence and no other architecture has needed it in the time it has been there. Move it into sandbox's private code. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/sandbox/cpu/start.c | 7 +++++++ common/board_f.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 6e4ec017cc..dc58fef90c 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -275,6 +275,12 @@ int board_run_command(const char *cmdline) return 1; } +static void setup_ram_buf(struct sandbox_state *state) +{ + gd->arch.ram_buf = state->ram_buf; + gd->ram_size = state->ram_size; +} + int main(int argc, char *argv[]) { struct sandbox_state *state; @@ -302,6 +308,7 @@ int main(int argc, char *argv[]) #ifdef CONFIG_SYS_MALLOC_F_LEN gd->malloc_base = CONFIG_MALLOC_F_ADDR; #endif + setup_ram_buf(state); /* Do pre- and post-relocation init */ board_init_f(0); diff --git a/common/board_f.c b/common/board_f.c index bb24a633fb..22829dfed0 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -58,9 +58,6 @@ #if defined(CONFIG_X86) || defined(CONFIG_ARC) || defined(CONFIG_XTENSA) #include <asm/relocate.h> #endif -#ifdef CONFIG_SANDBOX -#include <asm/state.h> -#endif #include <dm/root.h> #include <linux/compiler.h> @@ -295,18 +292,6 @@ __weak int mach_cpu_init(void) return 0; } -#ifdef CONFIG_SANDBOX -static int setup_ram_buf(void) -{ - struct sandbox_state *state = state_get_current(); - - gd->arch.ram_buf = state->ram_buf; - gd->ram_size = state->ram_size; - - return 0; -} -#endif - /* Get the top of usable RAM */ __weak ulong board_get_usable_ram_top(ulong total_size) { @@ -838,9 +823,6 @@ __weak int arch_cpu_init_dm(void) } static const init_fnc_t init_sequence_f[] = { -#ifdef CONFIG_SANDBOX - setup_ram_buf, -#endif setup_mon_len, #ifdef CONFIG_OF_CONTROL fdtdec_setup, -- 2.12.2.564.g063fe858b8-goog

6 60

[U-Boot] [PATCH 00/16] Clean up board_f sequence a little more
by Simon Glass 06 Apr '17

06 Apr '17

This series continues the effort to remove #ifdefs from the board_f init sequence. It follows on from the first series. With both series applied the number of references to CONFIG in board_f.c drops from 178 to 137: strings common/board_f.c |grep -c CONFIG Simon Glass (16): board_f: Drop board_type parameter from initdram() board_f: Drop return value from initdram() board_f: Rename initdram() to dram_init() xtensa: Place relocated U-Boot in the normal place board_f: Use a single condition for reserve_logbuffer() board_f: Move the extra #ifdef condition into reserve_mmu() board_f: Put video memory reservation in one function board_f: Drop CONFIG_SPL_BUILD check board_f: Drop setup_dram_config() wrapper Move dram_init_banksize() to a common header board_f: Drop unused headers board_f: Move errno.h down to the bottom powerpc: Move setup_board_extra() into a PPC file board_f: Make init_helpers generic board_f: Make relocation functions generic board_f: powerpc: Drop unused headers arch/arc/include/asm/init_helpers.h | 12 -- arch/arc/include/asm/relocate.h | 16 -- arch/arm/cpu/arm926ejs/armada100/dram.c | 4 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 +- arch/arm/include/asm/u-boot-arm.h | 1 - arch/arm/mach-davinci/misc.c | 4 +- arch/arm/mach-meson/board.c | 4 +- arch/arm/mach-mvebu/arm64-common.c | 8 +- arch/arm/mach-mvebu/dram.c | 4 +- arch/arm/mach-omap2/am33xx/emif4.c | 4 +- arch/arm/mach-omap2/omap3/emif4.c | 4 +- arch/arm/mach-omap2/omap3/sdrc.c | 4 +- arch/arm/mach-orion5x/dram.c | 4 +- arch/arm/mach-tegra/board2.c | 4 +- arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 4 +- arch/arm/mach-uniphier/dram_init.c | 4 +- arch/mips/mach-ath79/dram.c | 8 +- arch/mips/mach-pic32/cpu.c | 6 +- arch/mips/mach-pic32/include/mach/ddr.h | 2 +- arch/powerpc/cpu/mpc5xxx/spl_boot.c | 4 +- arch/powerpc/cpu/mpc85xx/cpu.c | 14 +- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 18 ++- arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c | 10 +- arch/powerpc/cpu/ppc4xx/sdram.c | 18 ++- arch/powerpc/cpu/ppc4xx/spl_boot.c | 2 +- arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/setup.c | 32 ++++ arch/x86/cpu/broadwell/sdram.c | 4 +- arch/x86/cpu/coreboot/sdram.c | 4 +- arch/x86/cpu/efi/sdram.c | 4 +- arch/x86/cpu/ivybridge/sdram.c | 4 +- arch/x86/cpu/qemu/dram.c | 4 +- arch/x86/cpu/quark/dram.c | 4 +- arch/x86/include/asm/relocate.h | 17 --- arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/efi/efi.c | 6 +- arch/x86/lib/fsp/fsp_dram.c | 4 +- arch/x86/lib/relocate.c | 2 +- arch/x86/lib/spl.c | 2 +- arch/xtensa/cpu/cpu.c | 5 + arch/xtensa/include/asm/relocate.h | 14 -- arch/xtensa/lib/relocate.c | 2 +- board/AndesTech/adp-ag101p/adp-ag101p.c | 4 +- board/Arcturus/ucp1020/spl.c | 2 +- board/BuS/eb_cpu5282/eb_cpu5282.c | 6 +- board/a3m071/a3m071.c | 6 +- board/a4m072/a4m072.c | 8 +- board/amcc/acadia/memory.c | 8 +- board/amcc/bamboo/bamboo.c | 8 +- board/amcc/bubinga/bubinga.c | 10 +- board/amcc/sequoia/sdram.c | 8 +- board/amcc/walnut/walnut.c | 10 +- board/amcc/yosemite/yosemite.c | 7 +- board/armadeus/apf27/apf27.c | 4 +- board/armltd/vexpress/vexpress_common.c | 4 +- board/armltd/vexpress64/vexpress64.c | 4 +- board/astro/mcf5373l/mcf5373l.c | 6 +- board/beckhoff/mx53cx9020/mx53cx9020.c | 4 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 4 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 4 +- board/broadcom/bcm_ep/board.c | 4 +- board/broadcom/bcmns2/northstar2.c | 4 +- board/cadence/xtfpga/xtfpga.c | 4 +- board/canmb/canmb.c | 8 +- board/cirrus/edb93xx/edb93xx.c | 4 +- board/cm5200/cm5200.c | 8 +- board/cobra5272/cobra5272.c | 7 +- board/compulab/cm_fx6/cm_fx6.c | 4 +- board/davedenx/aria/aria.c | 6 +- board/dbau1x00/dbau1x00.c | 8 +- board/denx/m53evk/m53evk.c | 4 +- board/esd/mecp5123/mecp5123.c | 6 +- board/esd/meesc/meesc.c | 4 +- board/esd/pmc440/sdram.c | 12 +- board/esd/vme8349/vme8349.c | 10 +- board/freescale/b4860qds/ddr.c | 6 +- board/freescale/b4860qds/spl.c | 2 +- board/freescale/c29xpcie/spl.c | 2 +- board/freescale/corenet_ds/ddr.c | 6 +- board/freescale/ls1021aqds/ddr.c | 10 +- board/freescale/ls1021aqds/ls1021aqds.c | 4 +- board/freescale/ls1043aqds/ddr.c | 6 +- board/freescale/ls1043aqds/ls1043aqds.c | 2 +- board/freescale/ls1043ardb/ddr.c | 6 +- board/freescale/ls1046aqds/ddr.c | 6 +- board/freescale/ls1046aqds/ls1046aqds.c | 2 +- board/freescale/ls1046ardb/ddr.c | 6 +- board/freescale/ls2080a/ddr.c | 8 +- board/freescale/ls2080aqds/ddr.c | 10 +- board/freescale/ls2080ardb/ddr.c | 10 +- board/freescale/m5208evbe/m5208evbe.c | 6 +- board/freescale/m52277evb/m52277evb.c | 6 +- board/freescale/m5235evb/m5235evb.c | 6 +- board/freescale/m5249evb/m5249evb.c | 9 +- board/freescale/m5253demo/m5253demo.c | 8 +- board/freescale/m5253evbe/m5253evbe.c | 8 +- board/freescale/m5272c3/m5272c3.c | 8 +- board/freescale/m5275evb/m5275evb.c | 8 +- board/freescale/m5282evb/m5282evb.c | 6 +- board/freescale/m53017evb/m53017evb.c | 6 +- board/freescale/m5329evb/m5329evb.c | 6 +- board/freescale/m5373evb/m5373evb.c | 6 +- board/freescale/m54418twr/m54418twr.c | 6 +- board/freescale/m54451evb/m54451evb.c | 6 +- board/freescale/m54455evb/m54455evb.c | 6 +- board/freescale/m547xevb/m547xevb.c | 6 +- board/freescale/m548xevb/m548xevb.c | 6 +- board/freescale/mpc5121ads/mpc5121ads.c | 6 +- board/freescale/mpc8308rdb/sdram.c | 8 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 2 +- board/freescale/mpc8313erdb/sdram.c | 8 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +- board/freescale/mpc8315erdb/sdram.c | 10 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 12 +- board/freescale/mpc832xemds/mpc832xemds.c | 12 +- board/freescale/mpc8349emds/mpc8349emds.c | 12 +- board/freescale/mpc8349itx/mpc8349itx.c | 10 +- board/freescale/mpc837xemds/mpc837xemds.c | 10 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 10 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 9 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 9 +- board/freescale/mx35pdk/mx35pdk.c | 4 +- board/freescale/mx53ard/mx53ard.c | 4 +- board/freescale/mx53loco/mx53loco.c | 4 +- board/freescale/mx53smd/mx53smd.c | 4 +- board/freescale/p1010rdb/spl.c | 2 +- board/freescale/p1022ds/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- board/freescale/p2041rdb/ddr.c | 10 +- board/freescale/t102xqds/ddr.c | 6 +- board/freescale/t102xqds/spl.c | 2 +- board/freescale/t102xrdb/ddr.c | 6 +- board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t1040qds/ddr.c | 6 +- board/freescale/t104xrdb/ddr.c | 6 +- board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t208xqds/ddr.c | 6 +- board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xrdb/ddr.c | 6 +- board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t4qds/ddr.c | 6 +- board/freescale/t4qds/spl.c | 2 +- board/freescale/t4rdb/ddr.c | 6 +- board/freescale/t4rdb/spl.c | 2 +- board/gaisler/gr_cpci_ax2000/gr_cpci_ax2000.c | 6 +- board/gaisler/gr_ep2s60/gr_ep2s60.c | 6 +- board/gaisler/gr_xc3s_1500/gr_xc3s_1500.c | 6 +- board/gaisler/grsim/grsim.c | 6 +- board/gaisler/grsim_leon2/grsim_leon2.c | 6 +- board/gdsys/mpc8308/sdram.c | 8 +- board/hisilicon/hikey/hikey.c | 4 +- board/ids/ids8313/ids8313.c | 8 +- board/ifm/ac14xx/ac14xx.c | 7 +- board/ifm/o2dnt2/o2dnt2.c | 6 +- board/imgtec/boston/ddr.c | 9 +- board/imgtec/malta/malta.c | 8 +- board/imgtec/xilfpga/xilfpga.c | 8 +- board/inka4x0/inka4x0.c | 8 +- board/intercontrol/digsy_mtc/digsy_mtc.c | 6 +- board/ipek01/ipek01.c | 6 +- board/jupiter/jupiter.c | 8 +- board/keymile/km82xx/km82xx.c | 8 +- board/keymile/km83xx/km83xx.c | 10 +- board/keymile/kmp204x/ddr.c | 8 +- board/liebherr/lwmon5/sdram.c | 8 +- board/micronas/vct/vct.c | 8 +- board/mini-box/picosam9g45/picosam9g45.c | 4 +- board/motionpro/motionpro.c | 8 +- board/mpc8308_p1m/sdram.c | 8 +- board/mpl/mip405/mip405.c | 8 +- board/mpl/pati/pati.c | 10 +- board/mpl/pip405/pip405.c | 8 +- board/munices/munices.c | 8 +- board/openrisc/openrisc-generic/openrisc-generic.c | 2 +- board/pb1x00/pb1x00.c | 8 +- board/pdm360ng/pdm360ng.c | 6 +- board/phytec/pcm030/pcm030.c | 8 +- board/qemu-mips/qemu-mips.c | 8 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 4 +- board/rockchip/evb_rk3328/evb-rk3328.c | 4 +- board/rockchip/evb_rk3399/evb-rk3399.c | 4 +- board/ronetix/pm9261/pm9261.c | 4 +- board/ronetix/pm9263/pm9263.c | 4 +- board/ronetix/pm9g45/pm9g45.c | 4 +- board/samsung/arndale/arndale.c | 4 +- board/samsung/common/board.c | 4 +- board/samsung/goni/goni.c | 4 +- board/samsung/smdkc100/smdkc100.c | 4 +- board/samsung/smdkv310/smdkv310.c | 4 +- board/sbc8349/sbc8349.c | 10 +- board/sbc8641d/sbc8641d.c | 8 +- board/spear/common/spr_misc.c | 4 +- board/st/stih410-b2260/board.c | 4 +- board/st/stv0991/stv0991.c | 4 +- board/sysam/amcore/amcore.c | 9 +- board/ti/dra7xx/evm.c | 4 +- board/tqc/tqm5200/tqm5200.c | 8 +- board/tqc/tqm834x/tqm834x.c | 6 +- board/tqc/tqm8xx/tqm8xx.c | 7 +- board/v38b/v38b.c | 7 +- board/varisys/cyrus/ddr.c | 6 +- board/ve8313/ve8313.c | 6 +- board/xes/xpedite1000/xpedite1000.c | 6 +- board/xes/xpedite517x/xpedite517x.c | 8 +- .../xilinx/microblaze-generic/microblaze-generic.c | 4 +- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 8 +- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 8 +- board/xilinx/zynq/board.c | 4 +- board/xilinx/zynqmp/zynqmp.c | 4 +- board/zipitz2/zipitz2.c | 4 +- common/board_f.c | 162 ++++----------------- common/board_r.c | 4 +- drivers/ddr/fsl/main.c | 4 +- include/asm-generic/global_data.h | 6 + include/common.h | 26 +++- {arch/x86/include/asm => include}/init_helpers.h | 7 +- include/relocate.h | 39 +++++ 217 files changed, 976 insertions(+), 581 deletions(-) delete mode 100644 arch/arc/include/asm/init_helpers.h delete mode 100644 arch/arc/include/asm/relocate.h create mode 100644 arch/powerpc/lib/setup.c delete mode 100644 arch/x86/include/asm/relocate.h delete mode 100644 arch/xtensa/include/asm/relocate.h rename {arch/x86/include/asm => include}/init_helpers.h (56%) create mode 100644 include/relocate.h -- 2.12.2.564.g063fe858b8-goog

4 47

[U-Boot] [PATCH 12/17] board_f: powerpc: Move prt_83xx_rsr() to private code
by Simon Glass 06 Apr '17

06 Apr '17

This function is called just before checkcpu() on MPX83xx. Move it to the code for that arch. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/powerpc/cpu/mpc83xx/cpu.c | 5 +++++ arch/powerpc/cpu/mpc83xx/cpu_init.c | 1 + arch/powerpc/include/asm/processor.h | 2 ++ common/board_f.c | 3 --- include/common.h | 2 -- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index c87f0fdd29..cb82621ec4 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -33,6 +33,7 @@ int checkcpu(void) u32 pvr = get_pvr(); u32 spridr; char buf[32]; + int ret; int i; const struct cpu_type { @@ -61,6 +62,10 @@ int checkcpu(void) immr = (immap_t *)CONFIG_SYS_IMMR; + ret = prt_83xx_rsr(); + if (ret) + return ret; + puts("CPU: "); switch (pvr & 0xffff0000) { diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 3a0916bdbf..2a9db0c51b 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -8,6 +8,7 @@ #include <mpc83xx.h> #include <ioports.h> #include <asm/io.h> +#include <asm/processor.h> #ifdef CONFIG_USB_EHCI_FSL #include <usb/ehci-ci.h> #endif diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 81bae6f008..c032726df1 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1354,6 +1354,8 @@ void ll_puts(const char *); /* In misc.c */ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); +int prt_83xx_rsr(void); + #endif /* ndef ASSEMBLY*/ #ifdef CONFIG_MACH_SPECIFIC diff --git a/common/board_f.c b/common/board_f.c index cbd9f67709..74cdef0ddb 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -864,9 +864,6 @@ static const init_fnc_t init_sequence_f[] = { prt_8260_rsr, prt_8260_clks, #endif /* CONFIG_MPC8260 */ -#if defined(CONFIG_MPC83xx) - prt_83xx_rsr, -#endif #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SH) checkcpu, #endif diff --git a/include/common.h b/include/common.h index 684083510b..6f08110b74 100644 --- a/include/common.h +++ b/include/common.h @@ -715,8 +715,6 @@ ulong cpu_init_f(void); int cpu_init_r (void); #if defined(CONFIG_MPC8260) int prt_8260_rsr (void); -#elif defined(CONFIG_MPC83xx) -int prt_83xx_rsr (void); #endif /* $(CPU)/interrupts.c */ -- 2.12.2.564.g063fe858b8-goog

2 1