May 2016 - U-Boot

[U-Boot] [GIT PULL] u-boot-mips/master
by Daniel Schwierzeck 26 May '16

26 May '16

Hi Tom, here is another batch of MIPS updates. The following changes since commit fc15b9beed05dec6cc092c265042381a0eadb0e9: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2016-05-24 13:42:03 -0400) are available in the git repository at: git://git.denx.de/u-boot-mips.git master for you to fetch changes up to 4349b55b9953d0bb591f13ca9985edf591348ced: mips: ath79: ar933x: Avoid warning with gcc5 (2016-05-26 01:34:14 +0200) ---------------------------------------------------------------- Marek Vasut (2): mips: Allow overriding start.S in SPL mips: Drop JZ4740 remnants Paul Burton (6): fdt: Support for ISA busses fdt: Document the rest of struct of_bus dm: ns16550: Don't map_physmem for I/O ports malta: Tidy up UART address selection malta: Use device model & tree for UART MIPS: Move CONFIG_SYS_TEXT_BASE to Kconfig Wills Wang (2): mips: ath79: ar933x: Fix ethernet PHY mismatch mips: ath79: ar933x: Avoid warning with gcc5 Kconfig | 2 +- arch/mips/Kconfig | 4 + arch/mips/Makefile | 6 + arch/mips/dts/Makefile | 1 + arch/mips/dts/mti,malta.dts | 32 ++++ arch/mips/include/asm/global_data.h | 8 - arch/mips/include/asm/jz4740.h | 1150 ------------------------------------------------------------------------------------------------------------- arch/mips/mach-ath79/ar933x/ddr.c | 2 + arch/mips/mach-ath79/include/mach/ar71xx_regs.h | 1 + arch/mips/mach-ath79/reset.c | 3 +- board/dbau1x00/Kconfig | 3 + board/imgtec/malta/Kconfig | 3 + board/imgtec/malta/malta.c | 13 -- board/microchip/pic32mzda/Kconfig | 3 + board/micronas/vct/Kconfig | 3 + board/pb1x00/Kconfig | 3 + board/qca/ap121/Kconfig | 3 + board/qca/ap143/Kconfig | 3 + board/qemu-mips/Kconfig | 4 + board/tplink/wdr4300/Kconfig | 3 + common/fdt_support.c | 120 +++++++++++- configs/malta_defconfig | 2 + configs/maltael_defconfig | 2 + drivers/core/Kconfig | 23 +++ drivers/serial/ns16550.c | 10 +- include/configs/ap121.h | 2 - include/configs/ap143.h | 2 - include/configs/dbau1x00.h | 6 - include/configs/malta.h | 9 +- include/configs/pb1x00.h | 6 - include/configs/pic32mzdask.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/tplink_wdr4300.h | 2 - include/configs/vct.h | 1 - 35 files changed, 230 insertions(+), 1208 deletions(-) create mode 100644 arch/mips/dts/mti,malta.dts delete mode 100644 arch/mips/include/asm/jz4740.h

2 1

[U-Boot] [PATCH] arm64: fix arm64 Linux boot image header field sizes
by Andre Przywara 26 May '16

26 May '16

The arm64 Linux boot protocol [1] describes the fields in the Image header as being 64-bit little endian values. So fix the endianess conversion to use 64-bit sized operations, for both image_size and text_offset. Also we use a local variable for the image_size to avoid both writing to the header and also accessing it after we actually unmapped it. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… --- cmd/bootm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/bootm.c b/cmd/bootm.c index 1bca6fa..ee3b460 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -655,6 +655,7 @@ static int booti_setup(bootm_headers_t *images) { struct Image_header *ih; uint64_t dst; + uint64_t image_size; ih = (struct Image_header *)map_sysmem(images->ep, 0); @@ -665,14 +666,16 @@ static int booti_setup(bootm_headers_t *images) if (ih->image_size == 0) { puts("Image lacks image_size field, assuming 16MiB\n"); - ih->image_size = (16 << 20); + image_size = 16 << 20; + } else { + image_size = le64_to_cpu(ih->image_size); } /* * If we are not at the correct run-time location, set the new * correct location and then move the image there. */ - dst = gd->bd->bi_dram[0].start + le32_to_cpu(ih->text_offset); + dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset); unmap_sysmem(ih); @@ -683,7 +686,7 @@ static int booti_setup(bootm_headers_t *images) src = (void *)images->ep; images->ep = dst; - memmove((void *)dst, src, le32_to_cpu(ih->image_size)); + memmove((void *)dst, src, image_size); } return 0; -- 2.8.2

2 1

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 26 May '16

26 May '16

Hi Tom, Here is the first sunxi pull-req for v2016.07, it contains a few improvements and fixes, nothing special. Note the big diffstat is due to cleaning up defconfig's be enabling various CMD options by default on sunxi. The following changes since commit fc15b9beed05dec6cc092c265042381a0eadb0e9: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2016-05-24 13:42:03 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to 0e6e34ac8dbb597a34e1eca4fb640c3eb5e52467: sunxi: Olimex A20 boards: Enable LDO3 and LDO4 regulators (2016-05-25 17:52:56 +0200) ---------------------------------------------------------------- Andre Przywara (3): Revert "sunxi: Reserve ATF memory space on A64" arm64: sunxi: adjust default load addresses arm64: Pine64: update FDT files Bernhard Nortmann (1): sunxi: Properly announce BOOT_DEVICE_BOARD as "FEL" Chen-Yu Tsai (10): sunxi: make SoC variant choice mandatory sunxi: Sort SoC variants by family (sunXi) first, chip name second sunxi: Add default MMC0 card detect pin for A83T, H3 and A64 SoCs sunxi: Disable VIDEO for SoCs without display support power: axp221: Remove switch case to simplify axp_set_eldo power: axp818: Fix typo for fldo2 Kconfig description sunxi: power: axp818: Add support for switch SW sunxi: Enable AXP818 SW for Sinovoip BPI M3 sunxi: Implement poweroff support for axp818 pmic sunxi: power: add AXP809 support Hans de Goede (1): sunxi: Enable a bunch of commands by default on sunxi Siarhei Siamashka (1): sunxi: Increase SPL header size to 64 bytes to avoid code corruption Stefan Mavrodiev (1): sunxi: Olimex A20 boards: Enable LDO3 and LDO4 regulators arch/arm/Kconfig | 10 + arch/arm/dts/Makefile | 3 +- ...4_common.dtsi => sun50i-a64-pine64-common.dtsi} | 34 +- ...{pine64_plus.dts => sun50i-a64-pine64-plus.dts} | 8 +- arch/arm/dts/{pine64.dts => sun50i-a64-pine64.dts} | 8 +- arch/arm/dts/{a64.dtsi => sun50i-a64.dtsi} | 400 ++++++++++++--------- arch/arm/include/asm/arch-sunxi/spl.h | 8 +- arch/arm/mach-sunxi/Makefile | 1 + arch/arm/mach-sunxi/board.c | 9 + arch/arm/mach-sunxi/pmic_bus.c | 6 +- board/sunxi/Kconfig | 33 +- board/sunxi/board.c | 30 +- configs/A10-OLinuXino-Lime_defconfig | 11 - configs/A10s-OLinuXino-M_defconfig | 11 - configs/A13-OLinuXinoM_defconfig | 11 - configs/A13-OLinuXino_defconfig | 11 - configs/A20-OLinuXino-Lime2_defconfig | 11 - configs/A20-OLinuXino-Lime_defconfig | 11 - configs/A20-OLinuXino_MICRO_defconfig | 13 +- configs/A20-Olimex-SOM-EVB_defconfig | 13 +- configs/Ainol_AW1_defconfig | 11 - configs/Ampe_A76_defconfig | 11 - configs/Auxtek-T003_defconfig | 11 - configs/Auxtek-T004_defconfig | 11 - configs/Bananapi_defconfig | 11 - configs/Bananapro_defconfig | 11 - configs/CHIP_defconfig | 10 - configs/CSQ_CS908_defconfig | 10 - configs/Chuwi_V7_CW0825_defconfig | 11 - configs/Colombus_defconfig | 11 - configs/Cubieboard2_defconfig | 11 - configs/Cubieboard_defconfig | 11 - configs/Cubietruck_defconfig | 11 - configs/Cubietruck_plus_defconfig | 11 - configs/Empire_electronix_d709_defconfig | 11 - configs/Hummingbird_A31_defconfig | 10 - configs/Hyundai_A7HD_defconfig | 11 - configs/Itead_Ibox_A20_defconfig | 11 - configs/Lamobo_R1_defconfig | 11 - configs/Linksprite_pcDuino3_Nano_defconfig | 11 - configs/Linksprite_pcDuino3_defconfig | 11 - configs/Linksprite_pcDuino_defconfig | 11 - configs/MK808C_defconfig | 11 - configs/MSI_Primo73_defconfig | 11 - configs/MSI_Primo81_defconfig | 10 - configs/Marsboard_A10_defconfig | 11 - configs/Mele_A1000G_quad_defconfig | 10 - configs/Mele_A1000_defconfig | 11 - configs/Mele_I7_defconfig | 10 - configs/Mele_M3_defconfig | 11 - configs/Mele_M5_defconfig | 11 - configs/Mele_M9_defconfig | 10 - configs/Merrii_A80_Optimus_defconfig | 10 - configs/Mini-X_defconfig | 11 - configs/Orangepi_defconfig | 11 - configs/Orangepi_mini_defconfig | 11 - configs/Sinlinx_SinA31s_defconfig | 10 - configs/Sinlinx_SinA33_defconfig | 10 - configs/Sinovoip_BPI_M2_defconfig | 10 - configs/Sinovoip_BPI_M3_defconfig | 11 +- configs/UTOO_P66_defconfig | 11 - configs/Wexler_TAB7200_defconfig | 11 - configs/Wits_Pro_A20_DKT_defconfig | 11 - configs/Wobo_i5_defconfig | 11 - configs/Yones_Toptech_BD1078_defconfig | 11 - configs/Yones_Toptech_BS1078_V2_defconfig | 10 - configs/ba10_tv_box_defconfig | 11 - configs/colorfly_e708_q1_defconfig | 10 - configs/difrnce_dit4350_defconfig | 11 - configs/dserve_dsrv9703c_defconfig | 11 - configs/ga10h_v1_1_defconfig | 10 - configs/gt90h_v4_defconfig | 10 - configs/h8_homlet_v2_defconfig | 10 - configs/i12-tvbox_defconfig | 11 - configs/iNet_3F_defconfig | 11 - configs/iNet_3W_defconfig | 11 - configs/iNet_86VS_defconfig | 11 - configs/icnova-a20-swac_defconfig | 11 - configs/inet1_defconfig | 11 - configs/inet97fv2_defconfig | 11 - configs/inet98v_rev2_defconfig | 11 - configs/inet9f_rev03_defconfig | 11 - configs/jesurun_q5_defconfig | 11 - configs/mixtile_loftq_defconfig | 10 - configs/mk802_a10s_defconfig | 11 - configs/mk802_defconfig | 11 - configs/mk802ii_defconfig | 11 - configs/orangepi_2_defconfig | 11 - configs/orangepi_one_defconfig | 10 - configs/orangepi_pc_defconfig | 11 - configs/orangepi_plus_defconfig | 11 - configs/pine64_plus_defconfig | 11 +- configs/polaroid_mid2809pxe04_defconfig | 10 - configs/pov_protab2_ips9_defconfig | 11 - configs/q8_a13_tablet_defconfig | 11 - configs/q8_a23_tablet_800x480_defconfig | 10 - configs/q8_a33_tablet_1024x600_defconfig | 10 - configs/q8_a33_tablet_800x480_defconfig | 10 - configs/r7-tv-dongle_defconfig | 11 - configs/sunxi_Gemei_G9_defconfig | 11 - drivers/power/Kconfig | 80 +++-- drivers/power/Makefile | 1 + drivers/power/axp221.c | 27 +- drivers/power/axp809.c | 238 ++++++++++++ drivers/power/axp818.c | 21 ++ include/axp809.h | 60 ++++ include/axp818.h | 4 + include/axp_pmic.h | 4 + include/configs/sunxi-common.h | 30 +- 109 files changed, 740 insertions(+), 1225 deletions(-) rename arch/arm/dts/{pine64_common.dtsi => sun50i-a64-pine64-common.dtsi} (88%) rename arch/arm/dts/{pine64_plus.dts => sun50i-a64-pine64-plus.dts} (91%) rename arch/arm/dts/{pine64.dts => sun50i-a64-pine64.dts} (91%) rename arch/arm/dts/{a64.dtsi => sun50i-a64.dtsi} (62%) create mode 100644 drivers/power/axp809.c create mode 100644 include/axp809.h Regards, Hans

2 1

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 26 May '16

26 May '16

Hi Tom, Here are some UniPhier SoC updates for v2016.07-rc1: - Support the second ARMv8 SoC from Socionext Inc. - Misc cleanups and fixes The following changes since commit fc15b9beed05dec6cc092c265042381a0eadb0e9: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2016-05-24 13:42:03 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to d7e103c08f5bb29d8126eaef3b7b6d6bafacea80: ARM: uniphier: add EHCI nodes for PH1-LD11 (2016-05-26 00:37:13 +0900) ---------------------------------------------------------------- Masahiro Yamada (7): ARM: uniphier: disable cache in SPL of PH1-LD20 ARM: uniphier: clean up boot mode tables ARM: uniphier: rename umc-ld20-regs.h to umc64-regs.h ARM: uniphier: rename UMC register macros of PH1-LD20 ARM: uniphier: add PH1-LD11 SoC support clk: uniphier: add Media I/O clock driver support for PH1-LD11 ARM: uniphier: add EHCI nodes for PH1-LD11 arch/arm/dts/uniphier-ph1-ld11-ref.dts | 12 +++ arch/arm/dts/uniphier-ph1-ld11.dtsi | 36 ++++++++ arch/arm/mach-uniphier/Kconfig | 5 ++ arch/arm/mach-uniphier/board_early_init_f.c | 7 ++ arch/arm/mach-uniphier/boards.c | 20 +++++ arch/arm/mach-uniphier/boot-mode/Makefile | 1 + arch/arm/mach-uniphier/boot-mode/boot-mode-ld20.c | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c | 6 +- arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c | 14 +-- arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 3 +- arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 3 +- arch/arm/mach-uniphier/clk/Makefile | 1 + arch/arm/mach-uniphier/clk/clk-ld11.c | 28 ++++++ arch/arm/mach-uniphier/cpu_info.c | 2 +- arch/arm/mach-uniphier/dram/Makefile | 1 + arch/arm/mach-uniphier/dram/umc-ld11.c | 124 +++++++++++++++++++++++++++ arch/arm/mach-uniphier/dram/umc-ld20.c | 6 +- .../arm/mach-uniphier/dram/{umc-ld20-regs.h => umc64-regs.h} | 16 +++- arch/arm/mach-uniphier/early-clk/Makefile | 1 + arch/arm/mach-uniphier/early-clk/early-clk-ld11.c | 32 +++++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 1 + arch/arm/mach-uniphier/init.h | 4 + arch/arm/mach-uniphier/init/Makefile | 1 + arch/arm/mach-uniphier/init/init-ld11.c | 59 +++++++++++++ arch/arm/mach-uniphier/init/init-ld20.c | 2 + arch/arm/mach-uniphier/init/init.c | 5 ++ arch/arm/mach-uniphier/pinctrl/Makefile | 1 + arch/arm/mach-uniphier/sbc/Makefile | 1 + arch/arm/mach-uniphier/sg-regs.h | 3 + configs/uniphier_ld11_defconfig | 31 +++++++ drivers/clk/uniphier/clk-uniphier-mio.c | 4 + include/configs/uniphier.h | 12 ++- 34 files changed, 426 insertions(+), 22 deletions(-) create mode 100644 arch/arm/mach-uniphier/clk/clk-ld11.c create mode 100644 arch/arm/mach-uniphier/dram/umc-ld11.c rename arch/arm/mach-uniphier/dram/{umc-ld20-regs.h => umc64-regs.h} (85%) create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-ld11.c create mode 100644 arch/arm/mach-uniphier/init/init-ld11.c create mode 100644 configs/uniphier_ld11_defconfig -- Best Regards Masahiro Yamada

2 1

[U-Boot] [PATCH] ARM: dts: dra7x: Support QSPI MODE-0 operation at 64MHz
by Vignesh R 26 May '16

26 May '16

According to Data Manual(SPRS915P) of AM57x, TI QSPI controller on DRA74(rev 1.1+)/DRA72 EVM can support up to 64MHz in MODE-0, whereas MODE-3 is limited to 48MHz. Hence, switch to MODE-0 for better throughput. Signed-off-by: Vignesh R <vigneshr(a)ti.com> --- arch/arm/dts/dra7-evm.dts | 6 ++---- arch/arm/dts/dra72-evm.dts | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/dra7-evm.dts b/arch/arm/dts/dra7-evm.dts index 08ef04e177b0..429b9edc1b2b 100644 --- a/arch/arm/dts/dra7-evm.dts +++ b/arch/arm/dts/dra7-evm.dts @@ -491,15 +491,13 @@ pinctrl-names = "default"; pinctrl-0 = <&qspi1_pins>; - spi-max-frequency = <48000000>; + spi-max-frequency = <64000000>; m25p80@0 { compatible = "s25fl256s1","spi-flash"; - spi-max-frequency = <48000000>; + spi-max-frequency = <64000000>; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; - spi-cpol; - spi-cpha; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/dts/dra72-evm.dts b/arch/arm/dts/dra72-evm.dts index 205103e2b0e1..ced2f1166d8c 100644 --- a/arch/arm/dts/dra72-evm.dts +++ b/arch/arm/dts/dra72-evm.dts @@ -603,15 +603,13 @@ pinctrl-names = "default"; pinctrl-0 = <&qspi1_pins>; - spi-max-frequency = <48000000>; + spi-max-frequency = <64000000>; m25p80@0 { compatible = "s25fl256s1","spi-flash"; - spi-max-frequency = <48000000>; + spi-max-frequency = <64000000>; reg = <0>; spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; - spi-cpol; - spi-cpha; #address-cells = <1>; #size-cells = <1>; -- 2.8.3

2 3

[U-Boot] Please pull u-boot-mpc85xx master
by York Sun 26 May '16

26 May '16

Tom, The following changes since commit aeaec0e682f45b9e0c62c522fafea353931f73ed: Prepare v2016.05 (2016-05-16 10:40:32 -0400) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to 8ef548d5f13e68e1b3975d9b68920bfa8bf09891: powerpc:t4240: MAC9 and MAC10 should not be identified as 1G interface in some case (2016-05-24 17:11:03 -0700) ---------------------------------------------------------------- Aneesh Bansal (1): powerpc/mpc85xx: set L2PE in L2CSR0 before enabling L2 cache Ying Zhang (2): powerpc:t4240rdb: Disable the non-existent ethernet ports on T4240RDB powerpc:t4240: MAC9 and MAC10 should not be identified as 1G interface in some case York Sun (4): powerpc: Disable flush or invalidate dcache by range for some SoCs powerpc/t208xqds: Update MAINTAINERS file powerpc/t208xrdb: Update MAINTAINERS file powerpc/t2080qds: Enable qixis commands to reboot from NAND and SD arch/powerpc/cpu/mpc85xx/start.S | 23 +++++++++++++++++++++++ arch/powerpc/lib/ppccache.S | 4 ++++ board/freescale/t208xqds/MAINTAINERS | 2 +- board/freescale/t208xrdb/MAINTAINERS | 2 +- board/freescale/t4rdb/eth.c | 5 +++++ drivers/net/fm/t4240.c | 2 +- include/configs/T208xQDS.h | 4 ++++ 7 files changed, 39 insertions(+), 3 deletions(-) Thanks. York

2 1

[U-Boot] [PATCH 0/4] Malta MIPS64 support
by Paul Burton 26 May '16

26 May '16

This series allows MIPS64 builds for Malta boards, which can be used either on real Malta boards with a MIPS64 CPU or in QEMU. It prepares by moving CONFIG_SYS_TEXT_BASE to Kconfig and fixing some 64 bit build issues that affect the ethernet driver, then allows the builds for the Malta board. This series applies atop u-boot-mips/next with my "Malta UART using device model & device tree" series applied. Paul Burton (4): MIPS: Move CONFIG_SYS_TEXT_BASE to Kconfig MIPS: Fix _ACAST32_ for pointers on MIPS64 net: pcnet: Make 64 bit safe malta: Allow MIPS64 builds Kconfig | 2 +- arch/mips/Kconfig | 3 +++ arch/mips/include/asm/addrspace.h | 4 ++-- board/dbau1x00/Kconfig | 3 +++ board/imgtec/malta/Kconfig | 4 ++++ board/imgtec/malta/lowlevel_init.S | 13 +++++++------ board/microchip/pic32mzda/Kconfig | 3 +++ board/micronas/vct/Kconfig | 3 +++ board/pb1x00/Kconfig | 3 +++ board/qca/ap121/Kconfig | 3 +++ board/qca/ap143/Kconfig | 3 +++ board/qemu-mips/Kconfig | 4 ++++ board/tplink/wdr4300/Kconfig | 3 +++ drivers/net/pcnet.c | 18 ++++++++++-------- include/configs/ap121.h | 2 -- include/configs/ap143.h | 2 -- include/configs/dbau1x00.h | 6 ------ include/configs/malta.h | 19 +++++++++++++------ include/configs/pb1x00.h | 6 ------ include/configs/pic32mzdask.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/tplink_wdr4300.h | 2 -- include/configs/vct.h | 1 - 24 files changed, 65 insertions(+), 45 deletions(-) -- 2.8.2

3 12

[U-Boot] [PATCH v2] arm64: allow space reservation for boot header
by Andre Przywara 26 May '16

26 May '16

Some SPL loaders (like Allwinner's boot0) require a header before the actual U-Boot binary to both check its validity and to find other data to load. Introduce a config option to reserve some space at the beginning of the binary to later hold the header if needed. Please note that the current arm64 start.S jumps over some portion of data already, so this option bascially just increases this region to allow post-processing tools to insert more data there. This also means that both filling the header is optional and also having some extra space in there does not hurt apart from enlarging the binary. For the use with Allwinner's boot0 blob there is a tool called boot0img[1], which fills the header to allow booting A64 based boards. For the Pine64 we need a 1536 Byte header (including the branch instruction) at the moment, so we add this to the defconfig. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> [1] https://github.com/apritzel/pine64/tree/master/tools --- arch/arm/cpu/armv8/start.S | 3 +++ board/sunxi/Kconfig | 7 +++++++ configs/pine64_plus_defconfig | 1 + include/configs/sun50i.h | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index e933021..a9cd7e9 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -21,6 +21,9 @@ _start: b reset +#ifdef CONFIG_START_HEADER_SPACE + .space CONFIG_START_HEADER_SPACE /* can be filled with a boot0 header */ +#endif .align 3 .globl _TEXT_BASE diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index fa78720..9f2e17e 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -15,6 +15,13 @@ config SUNXI_GEN_SUN6I separate ahb reset control registers, custom pmic bus, new style watchdog, etc. +config SUNXI_BOOT0 + bool "prepare for boot0 header" + ---help--- + If U-Boot is loaded from the Allwinner provided boot0 blob, it + expects a header area filled with magic values. + This option will add some space at the beginning of the image to + let a tool later on fill in this header with sensible data. choice prompt "Sunxi SoC Variant" diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig index 0977334..b93e4da 100644 --- a/configs/pine64_plus_defconfig +++ b/configs/pine64_plus_defconfig @@ -18,3 +18,4 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_SUNXI_BOOT0=y diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index 0fdb4c7..6923b60 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -17,6 +17,10 @@ #define GICD_BASE 0x1c81000 #define GICC_BASE 0x1c82000 +#ifdef CONFIG_SUNXI_BOOT0 +#define CONFIG_START_HEADER_SPACE 1532 +#endif + /* * Include common sunxi configuration where most the settings are */ -- 2.8.2

3 5

[U-Boot] [PATCH v2] mmc: atmel_sdhci: Convert to the driver model support
by Wenyou Yang 26 May '16

26 May '16

Convert the driver to the driver model while retaining the existing legacy code. This allows the driver to support boards that have converted to driver model as well as those that have not. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- Changes in v2: - Add clock support, include enabling peripheral clock and generated clock. - Retain the existing legacy code to support boards which have not converted to driver model. drivers/mmc/Kconfig | 10 +++++ drivers/mmc/atmel_sdhci.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index dc8532f..7f6b2e1 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -16,6 +16,16 @@ config DM_MMC appear as block devices in U-Boot and can support filesystems such as EXT4 and FAT. +config ATMEL_SDHCI + bool "Atmel SDHCI controller support" + depends on DM_MMC && ARCH_AT91 + help + This enables support for the Atmel SDHCI controller, which supports + the embedded MultiMedia Card (e.MMC) Specification V4.51, the SD + Memory Card Specification V3.0, and the SDIO V3.0 specification. + It is compliant with the SD Host Controller Standard V3.0 + specification. + config ROCKCHIP_DWMMC bool "Rockchip SD/MMC controller support" depends on DM_MMC && OF_CONTROL diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index 24b68b6..6db3021 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -6,12 +6,16 @@ */ #include <common.h> +#include <clk.h> +#include <dm.h> #include <malloc.h> #include <sdhci.h> #include <asm/arch/clk.h> #define ATMEL_SDHC_MIN_FREQ 400000 +#ifndef CONFIG_DM_MMC + int atmel_sdhci_init(void *regbase, u32 id) { struct sdhci_host *host; @@ -38,3 +42,109 @@ int atmel_sdhci_init(void *regbase, u32 id) return 0; } + +#else + +DECLARE_GLOBAL_DATA_PTR; + +static int atmel_sdhci_probe(struct udevice *dev) +{ + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + struct sdhci_host *host = dev_get_priv(dev); + u32 max_clk, min_clk = ATMEL_SDHC_MIN_FREQ; + u32 caps0, caps1; + u32 clk_base, clk_mul; + u32 gck_rate; + struct udevice *clkdev; + int periph, ret; + + ret = clk_get_by_index(dev, 0, &clkdev); + if (ret) { + dev_err(dev, "Failed to get peripheral clock\n"); + return ret; + } + + periph = fdtdec_get_uint(gd->fdt_blob, clkdev->of_offset, "reg", -1); + if (periph < 0) { + dev_err(dev, "Failed to find peripheral id\n"); + return -EINVAL; + } + + clkdev = dev_get_parent(clkdev); + if (!clkdev) { + dev_err(dev, "Failed to find parent node\n"); + return -ENODEV; + } + + ret = clk_enable(clkdev, periph); + if (ret) { + dev_err(dev, "Failed to enable peripheral clock\n"); + return ret; + } + + host->name = (char *)dev->name; + host->ioaddr = (void *)dev_get_addr(dev); + + host->quirks = 0; + host->version = sdhci_readw(host, SDHCI_HOST_VERSION); + + host->bus_width = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "bus-width", 4); + + caps0 = readl(host->ioaddr + SDHCI_CAPABILITIES); + caps1 = readl(host->ioaddr + SDHCI_CAPABILITIES_1); + clk_base = (caps0 & SDHCI_CLOCK_V3_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT; + clk_mul = (caps1 & SDHCI_CLOCK_MUL_MASK) >> SDHCI_CLOCK_MUL_SHIFT; + gck_rate = clk_base * 1000000 * (clk_mul + 1); + + ret = clk_get_by_index(dev, 1, &clkdev); + if (ret) { + dev_err(dev, "Failed to get generated clock\n"); + return ret; + } + + periph = fdtdec_get_uint(gd->fdt_blob, clkdev->of_offset, "reg", -1); + if (periph < 0) { + dev_err(dev, "Failed to find peripheral id\n"); + return -EINVAL; + } + + clkdev = dev_get_parent(clkdev); + if (!clkdev) { + dev_err(dev, "Failed to find parent node\n"); + return -ENODEV; + } + + ret = clk_set_periph_rate(clkdev, periph, gck_rate); + if (ret) { + dev_err(dev, "Failed to set generated clock rate\n"); + return -ENODEV; + } + + max_clk = clk_get_periph_rate(clkdev, periph); + if (!max_clk) { + dev_err(dev, "Failed to get generated clock rate\n"); + return -ENODEV; + } + + add_sdhci(host, max_clk, min_clk); + + upriv->mmc = host->mmc; + + return 0; +} + +static const struct udevice_id atmel_sdhci_ids[] = { + { .compatible = "atmel,sama5d2-sdhci" }, + { } +}; + +U_BOOT_DRIVER(atmel_sdhci_drv) = { + .name = "atmel_sdhci", + .id = UCLASS_MMC, + .of_match = atmel_sdhci_ids, + .probe = atmel_sdhci_probe, + .priv_auto_alloc_size = sizeof(struct sdhci_host), +}; + +#endif -- 2.7.4

1 0

[U-Boot] [PATCH 1/2] ARM: exynos: Fix build error if SERIAL is disabled in SPL
by Marek Vasut 26 May '16

26 May '16

If CONFIG_SPL_SERIAL_SUPPORT is not defined in include/configs/exynos5-common.h the following error is produced during the build of the SPL: arch/arm/mach-exynos/built-in.o: In function `do_lowlevel_init': ...u-boot/arch/arm/mach-exynos/lowlevel_init.c:221: undefined reference to `debug_uart_init' Add additional condition to check if SPL build is in progress and in that case check if CONFIG_SPL_SERIAL_SUPPORT is also set before enabling the debug UART. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-exynos/lowlevel_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 6c39cb2..1e090fd 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -216,9 +216,12 @@ int do_lowlevel_init(void) if (actions & DO_CLOCKS) { system_clock_init(); #ifdef CONFIG_DEBUG_UART +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL_SUPPORT)) || \ + !defined(CONFIG_SPL_BUILD) exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); debug_uart_init(); #endif +#endif mem_ctrl_init(actions & DO_MEM_RESET); tzpc_init(); } -- 2.7.0

4 7