August 2018 - U-Boot

[U-Boot] [PATCH 0/7] ARM: dts: sunxi: Update dts(i) files from
by Jagan Teki 13 Aug '18

13 Aug '18

This series is trying to update SoC dtsi and board dts files for Allwinner sun4i, 5i, 6i, 8i-a23/a33/a83t, r40 SoC's from Linux-4.18-rc3 These update is useful for supporting features CLK, RESET, DM_MMC etc Since H3/H5/A64 is already updated with Linux-4.18-rc3, this series use same version to maintain proper compatibility for all SoC platforms syncs. thanks, Jagan. Jagan Teki (7): ARM: dts: sun4i: Update A10 dts(i) files from Linux ARM: dts: sun5i: Update A10s/A13/gr8/r8 dts(i) files from Linux ARM: dts: sun6i: Update A31/A31s dts(i) files from Linux ARM: dts: sun7i: Update A20 dts(i) files from Linux ARM: dts: sun8i: Update A23/A33/r16 dts(i) files from Linux ARM: dts: sun8i: Update A83T dts(i) files from Linux ARM: dts: sun8i: Update R40/V40 dts(i) files from Linux arch/arm/dts/axp209.dtsi | 17 +- arch/arm/dts/axp81x.dtsi | 169 ++ arch/arm/dts/sun4i-a10-a1000.dts | 61 +- arch/arm/dts/sun4i-a10-ba10-tvbox.dts | 23 +- arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts | 37 +- arch/arm/dts/sun4i-a10-cubieboard.dts | 67 +- arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts | 76 +- arch/arm/dts/sun4i-a10-gemei-g9.dts | 28 +- arch/arm/dts/sun4i-a10-hackberry.dts | 32 +- arch/arm/dts/sun4i-a10-hyundai-a7hd.dts | 31 +- arch/arm/dts/sun4i-a10-inet-3f.dts | 2 +- arch/arm/dts/sun4i-a10-inet-3w.dts | 2 +- arch/arm/dts/sun4i-a10-inet1.dts | 58 +- arch/arm/dts/sun4i-a10-inet97fv2.dts | 41 +- arch/arm/dts/sun4i-a10-inet9f-rev03.dts | 101 +- .../dts/sun4i-a10-itead-iteaduino-plus.dts | 24 +- arch/arm/dts/sun4i-a10-jesurun-q5.dts | 34 +- arch/arm/dts/sun4i-a10-marsboard.dts | 38 +- arch/arm/dts/sun4i-a10-mini-xplus.dts | 16 +- arch/arm/dts/sun4i-a10-mk802.dts | 59 +- arch/arm/dts/sun4i-a10-mk802ii.dts | 9 +- arch/arm/dts/sun4i-a10-olinuxino-lime.dts | 75 +- arch/arm/dts/sun4i-a10-pcduino.dts | 47 +- arch/arm/dts/sun4i-a10-pcduino2.dts | 11 - arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts | 89 +- arch/arm/dts/sun4i-a10.dtsi | 1349 +++++++-------- arch/arm/dts/sun5i-a10s-auxtek-t003.dts | 26 +- arch/arm/dts/sun5i-a10s-auxtek-t004.dts | 42 +- arch/arm/dts/sun5i-a10s-mk802.dts | 24 +- arch/arm/dts/sun5i-a10s-olinuxino-micro.dts | 82 +- arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts | 24 +- arch/arm/dts/sun5i-a10s-wobo-i5.dts | 29 +- arch/arm/dts/sun5i-a10s.dtsi | 224 +-- .../dts/sun5i-a13-empire-electronix-d709.dts | 29 +- arch/arm/dts/sun5i-a13-hsg-h702.dts | 29 +- arch/arm/dts/sun5i-a13-inet-98v-rev2.dts | 164 +- arch/arm/dts/sun5i-a13-olinuxino-micro.dts | 44 +- arch/arm/dts/sun5i-a13-olinuxino.dts | 100 +- arch/arm/dts/sun5i-a13-utoo-p66.dts | 49 +- arch/arm/dts/sun5i-a13.dtsi | 268 +-- arch/arm/dts/sun5i-gr8-chip-pro.dts | 16 +- arch/arm/dts/sun5i-gr8.dtsi | 1082 +----------- arch/arm/dts/sun5i-r8-chip.dts | 91 +- arch/arm/dts/sun5i-r8.dtsi | 40 - .../dts/sun5i-reference-design-tablet.dtsi | 69 +- arch/arm/dts/sun5i.dtsi | 792 ++++----- arch/arm/dts/sun6i-a31-app4-evb1.dts | 7 +- arch/arm/dts/sun6i-a31-colombus.dts | 26 +- arch/arm/dts/sun6i-a31-hummingbird.dts | 153 +- arch/arm/dts/sun6i-a31-i7.dts | 82 +- arch/arm/dts/sun6i-a31-m9.dts | 23 +- arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts | 23 +- arch/arm/dts/sun6i-a31.dtsi | 1151 ++++++++----- arch/arm/dts/sun6i-a31s-cs908.dts | 2 - arch/arm/dts/sun6i-a31s-primo81.dts | 69 +- arch/arm/dts/sun6i-a31s-sina31s-core.dtsi | 1 - arch/arm/dts/sun6i-a31s-sina31s.dts | 77 +- arch/arm/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 154 +- .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 13 +- arch/arm/dts/sun6i-a31s.dtsi | 8 + .../dts/sun6i-reference-design-tablet.dtsi | 18 +- arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 32 +- arch/arm/dts/sun7i-a20-bananapi.dts | 106 +- arch/arm/dts/sun7i-a20-bananapro.dts | 73 +- arch/arm/dts/sun7i-a20-cubieboard2.dts | 56 +- arch/arm/dts/sun7i-a20-cubietruck.dts | 84 +- arch/arm/dts/sun7i-a20-hummingbird.dts | 30 +- arch/arm/dts/sun7i-a20-i12-tvbox.dts | 34 +- arch/arm/dts/sun7i-a20-icnova-swac.dts | 6 +- arch/arm/dts/sun7i-a20-itead-ibox.dts | 12 +- arch/arm/dts/sun7i-a20-lamobo-r1.dts | 73 +- arch/arm/dts/sun7i-a20-m3.dts | 12 +- arch/arm/dts/sun7i-a20-mk808c.dts | 43 +- arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 108 +- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 42 +- arch/arm/dts/sun7i-a20-olinuxino-lime.dts | 58 +- .../dts/sun7i-a20-olinuxino-lime2-emmc.dts | 6 +- arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 154 +- arch/arm/dts/sun7i-a20-olinuxino-micro.dts | 116 +- arch/arm/dts/sun7i-a20-orangepi-mini.dts | 77 +- arch/arm/dts/sun7i-a20-orangepi.dts | 42 +- arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 55 +- arch/arm/dts/sun7i-a20-pcduino3.dts | 26 +- arch/arm/dts/sun7i-a20-primo73.dts | 58 +- arch/arm/dts/sun7i-a20-wexler-tab7200.dts | 30 +- arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 20 +- arch/arm/dts/sun7i-a20.dtsi | 1505 +++++++---------- arch/arm/dts/sun8i-a23-a33.dtsi | 112 +- arch/arm/dts/sun8i-a23-evb.dts | 11 +- arch/arm/dts/sun8i-a23-gt90h-v4.dts | 5 +- arch/arm/dts/sun8i-a23-inet86dz.dts | 6 +- .../dts/sun8i-a23-polaroid-mid2407pxe03.dts | 34 +- .../dts/sun8i-a23-polaroid-mid2809pxe04.dts | 25 +- arch/arm/dts/sun8i-a23-q8-tablet.dts | 13 + arch/arm/dts/sun8i-a23.dtsi | 4 +- arch/arm/dts/sun8i-a33-ga10h-v1.1.dts | 5 +- arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 29 +- arch/arm/dts/sun8i-a33-olinuxino.dts | 66 +- arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 53 +- arch/arm/dts/sun8i-a33.dtsi | 63 +- .../dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 195 ++- arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 298 +++- arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 322 +++- arch/arm/dts/sun8i-a83t-tbs-a711.dts | 355 +++- arch/arm/dts/sun8i-a83t.dtsi | 885 +++++++++- arch/arm/dts/sun8i-q8-common.dtsi | 30 +- arch/arm/dts/sun8i-r16-bananapi-m2m.dts | 3 +- ...sun8i-r16-nintendo-nes-classic-edition.dts | 2 - arch/arm/dts/sun8i-r16-parrot.dts | 50 +- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 168 +- arch/arm/dts/sun8i-r40.dtsi | 303 +++- .../dts/sun8i-reference-design-tablet.dtsi | 59 +- arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 50 + include/dt-bindings/clock/sun4i-a10-ccu.h | 202 +++ include/dt-bindings/clock/sun5i-ccu.h | 106 ++ include/dt-bindings/clock/sun6i-a31-ccu.h | 191 +++ include/dt-bindings/clock/sun7i-a20-ccu.h | 53 + include/dt-bindings/clock/sun8i-a83t-ccu.h | 140 ++ include/dt-bindings/reset/sun4i-a10-ccu.h | 69 + include/dt-bindings/reset/sun5i-ccu.h | 32 + include/dt-bindings/reset/sun6i-a31-ccu.h | 106 ++ include/dt-bindings/reset/sun8i-a83t-ccu.h | 98 ++ 122 files changed, 8374 insertions(+), 6154 deletions(-) create mode 100644 arch/arm/dts/axp81x.dtsi create mode 100644 include/dt-bindings/clock/sun4i-a10-ccu.h create mode 100644 include/dt-bindings/clock/sun5i-ccu.h create mode 100644 include/dt-bindings/clock/sun6i-a31-ccu.h create mode 100644 include/dt-bindings/clock/sun7i-a20-ccu.h create mode 100644 include/dt-bindings/clock/sun8i-a83t-ccu.h create mode 100644 include/dt-bindings/reset/sun4i-a10-ccu.h create mode 100644 include/dt-bindings/reset/sun5i-ccu.h create mode 100644 include/dt-bindings/reset/sun6i-a31-ccu.h create mode 100644 include/dt-bindings/reset/sun8i-a83t-ccu.h -- 2.18.0.321.gffc6fa0e3

2 9

[U-Boot] [PATCH v2 00/53] clk: Add Allwinner CLK, RESET support
by Jagan Teki 13 Aug '18

13 Aug '18

This series is refined version of Allwinner CLK, RESET support for previous RFC[3] which implements CLK and RESET for - USB - MMC - SPI - UART - Ethernet This series depends on 'musb shutdown' series [1] and Linux dts(i) sync series [2]. Since this series supporting MMC, the previous version[4] DM_MMC migration changes are squashed and droped reset and clock ccm hacks. Tested on A64, H3, H5, R40, A83T, A20. Changes for v2: - Fixed few warnings and spaces in reset descriptor table. - Add Ethernet CLK and RESET changes Note: - added previous version fastboot, env changes as-it-is, so-that we can discuss it further. - V3S, A23, A33 still need to test. All these changes available at u-boot-sunxi/clk Any inputs, Jagan. [1] https://patchwork.ozlabs.org/cover/946738/ [2] https://patchwork.ozlabs.org/cover/955563/ [3] https://patchwork.ozlabs.org/cover/944313/ [4] https://patchwork.ozlabs.org/cover/944180/ Jagan Teki (53): clk: Kconfig: Ascending order to sub directiory kconfigs clk: Add Allwinner A64 CLK driver reset: Add default request ops reset: Add Allwinner RESET driver clk: sunxi: Add Allwinner H3/H5 CLK driver clk: sunxi: Add Allwinner A10/A20 CLK driver clk: sunxi: Add Allwinner A10s/A13 CLK driver clk: sunxi: Add Allwinner A31 CLK driver clk: sunxi: Add Allwinner A23 CLK driver clk: sunxi: a23: Add CLK support for A33 clk: sunxi: Add Allwinner A83T CLK driver clk: sunxi: Add Allwinner R40 CLK driver clk: sunxi: Add Allwinner V3S CLK driver sunxi: Enable CLK musb-new: sunxi: Use CLK and RESET support phy: sun4i-usb: Use CLK and RESET support sunxi: usb: Switch to Generic host controllers usb: host: Drop [e-o]hci-sunxi drivers clk: sunxi: Implement AHB bus MMC clocks clk: sunxi: Implement direct MMC clocks clk: sunxi: Implement AHB bus MMC resets reset: Add get reset by name optionally reset: Add reset valid dm: mmc: sunxi: Add CLK and RESET support fastboot: sunxi: Update fastboot mmc default device env: sunxi: Update default env fat device sunxi: Use mmc_bootdev=2 for MMC2 boot sunxi: A20: Enable DM_MMC mmc: sunxi: Add mmc, emmc H5/A64 compatible sunxi: H3_H5: Enable DM_MMC sunxi: A64: Enable DM_MMC mmc: sunxi: Add A83T emmc compatible sunxi: A83T: Enable DM_MMC sunxi: V40: Enable DM_MMC sunxi: A13/A31: Enable DM_MMC sunxi: A23/A33/V3S: Enable DM_MMC clk: sunxi: Implement SPI clocks clk: sunxi: Implement SPI resets spi: sun4i: Add CLK support spi: Add Allwinner A31 SPI driver clk: sunxi: Implement UART clocks clk: sunxi: Implement UART resets clk: sunxi: Implement Ethernet clocks clk: sunxi: Implement Ethernet resets net: sunxi_emac: Add CLK support net: sun8i_emac: Retrieve GMAC clock via 'syscon' phandle net: sun8i_emac: Add CLK and RESET support clk: Get the CLK by index without device clk: Use clk_get_by_index_tail() reset: Get the RESET by index without device clk: sunxi: h3: Implement EPHY CLK and RESET net: sun8i_emac: Add EPHY CLK and RESET support board: sunxi: gmac: Remove Ethernet clock and reset arch/arm/include/asm/arch-sunxi/ccu.h | 82 +++ arch/arm/mach-sunxi/Kconfig | 22 + board/sunxi/board.c | 2 +- board/sunxi/gmac.c | 8 - configs/A10-OLinuXino-Lime_defconfig | 1 + configs/A10s-OLinuXino-M_defconfig | 1 + configs/A13-OLinuXinoM_defconfig | 1 + configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime2-eMMC_defconfig | 3 + configs/A20-OLinuXino-Lime2_defconfig | 1 + configs/A20-OLinuXino-Lime_defconfig | 1 + configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 + configs/A20-OLinuXino_MICRO_defconfig | 1 + configs/A20-Olimex-SOM-EVB_defconfig | 1 + configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 + configs/A20-Olimex-SOM204-EVB_defconfig | 2 + configs/Auxtek-T003_defconfig | 1 + configs/Auxtek-T004_defconfig | 1 + configs/Bananapi_defconfig | 1 + configs/Bananapi_m2m_defconfig | 1 + configs/Bananapro_defconfig | 1 + configs/CHIP_defconfig | 1 + configs/CHIP_pro_defconfig | 1 + configs/CSQ_CS908_defconfig | 1 + configs/Colombus_defconfig | 1 + configs/Cubieboard2_defconfig | 1 + configs/Cubieboard_defconfig | 1 + configs/Cubietruck_plus_defconfig | 1 + configs/Hummingbird_A31_defconfig | 1 + configs/Itead_Ibox_A20_defconfig | 1 + configs/Linksprite_pcDuino3_Nano_defconfig | 1 + configs/Linksprite_pcDuino3_defconfig | 1 + configs/Linksprite_pcDuino_defconfig | 1 + configs/MK808C_defconfig | 1 + configs/Marsboard_A10_defconfig | 1 + configs/Mele_A1000G_quad_defconfig | 1 + configs/Mele_A1000_defconfig | 1 + configs/Mele_I7_defconfig | 1 + configs/Mele_M3_defconfig | 2 + configs/Mele_M5_defconfig | 1 + configs/Mele_M9_defconfig | 1 + configs/Mini-X_defconfig | 1 + configs/Orangepi_defconfig | 1 + configs/Orangepi_mini_defconfig | 2 + configs/Sinlinx_SinA31s_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 3 + configs/Sinovoip_BPI_M2_Plus_defconfig | 1 + configs/Sinovoip_BPI_M2_defconfig | 1 + configs/Sinovoip_BPI_M3_defconfig | 1 + configs/Wexler_TAB7200_defconfig | 1 + configs/Wobo_i5_defconfig | 1 + configs/Yones_Toptech_BD1078_defconfig | 1 + configs/a64-olinuxino_defconfig | 1 + configs/amarula_a64_relic_defconfig | 2 + configs/ba10_tv_box_defconfig | 1 + configs/bananapi_m1_plus_defconfig | 1 + configs/bananapi_m64_defconfig | 1 + configs/ga10h_v1_1_defconfig | 1 + configs/h8_homlet_v2_defconfig | 1 + configs/i12-tvbox_defconfig | 1 + configs/icnova-a20-swac_defconfig | 1 + configs/inet1_defconfig | 1 + configs/inet_q972_defconfig | 1 + configs/jesurun_q5_defconfig | 1 + configs/libretech_all_h3_cc_h2_plus_defconfig | 1 + configs/libretech_all_h3_cc_h3_defconfig | 1 + configs/libretech_all_h3_cc_h5_defconfig | 1 + configs/mixtile_loftq_defconfig | 1 + configs/mk802_a10s_defconfig | 1 + configs/mk802_defconfig | 1 + configs/mk802ii_defconfig | 1 + configs/nanopi_a64_defconfig | 1 + configs/nanopi_m1_defconfig | 1 + configs/nanopi_m1_plus_defconfig | 1 + configs/nanopi_neo2_defconfig | 1 + configs/nanopi_neo_air_defconfig | 1 + configs/nanopi_neo_defconfig | 1 + configs/nanopi_neo_plus2_defconfig | 1 + configs/orangepi_2_defconfig | 1 + configs/orangepi_lite_defconfig | 1 + configs/orangepi_one_defconfig | 1 + configs/orangepi_pc2_defconfig | 1 + configs/orangepi_pc_defconfig | 1 + configs/orangepi_pc_plus_defconfig | 1 + configs/orangepi_plus2e_defconfig | 1 + configs/orangepi_plus_defconfig | 1 + configs/orangepi_prime_defconfig | 1 + configs/orangepi_r1_defconfig | 1 + configs/orangepi_win_defconfig | 1 + configs/orangepi_zero_defconfig | 1 + configs/orangepi_zero_plus2_defconfig | 1 + configs/orangepi_zero_plus_defconfig | 1 + configs/parrot_r16_defconfig | 1 + configs/pine64_plus_defconfig | 1 + configs/r7-tv-dongle_defconfig | 1 + configs/sopine_baseboard_defconfig | 1 + configs/sun8i_a23_evb_defconfig | 1 + configs/sunxi_Gemei_G9_defconfig | 1 + configs/tbs_a711_defconfig | 1 + drivers/clk/Kconfig | 9 +- drivers/clk/Makefile | 1 + drivers/clk/clk-uclass.c | 84 +++- drivers/clk/sunxi/Kconfig | 75 +++ drivers/clk/sunxi/Makefile | 17 + drivers/clk/sunxi/clk_a10.c | 107 ++++ drivers/clk/sunxi/clk_a10s.c | 96 ++++ drivers/clk/sunxi/clk_a23.c | 105 ++++ drivers/clk/sunxi/clk_a31.c | 128 +++++ drivers/clk/sunxi/clk_a64.c | 115 +++++ drivers/clk/sunxi/clk_a83t.c | 105 ++++ drivers/clk/sunxi/clk_h3.c | 130 +++++ drivers/clk/sunxi/clk_r40.c | 123 +++++ drivers/clk/sunxi/clk_sunxi.c | 77 +++ drivers/clk/sunxi/clk_v3s.c | 91 ++++ drivers/fastboot/Kconfig | 3 +- drivers/mmc/sunxi_mmc.c | 121 +++-- drivers/net/sun8i_emac.c | 179 ++++--- drivers/net/sunxi_emac.c | 28 +- drivers/phy/allwinner/phy-sun4i-usb.c | 77 ++- drivers/reset/Kconfig | 8 + drivers/reset/Makefile | 1 + drivers/reset/reset-sunxi.c | 124 +++++ drivers/reset/reset-uclass.c | 81 ++- drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/sun4i_spi.c | 40 +- drivers/spi/sun6i_spi.c | 475 ++++++++++++++++++ drivers/usb/host/Kconfig | 2 + drivers/usb/host/Makefile | 2 - drivers/usb/host/ehci-sunxi.c | 204 -------- drivers/usb/host/ohci-sunxi.c | 233 --------- drivers/usb/musb-new/sunxi.c | 82 +-- env/Kconfig | 3 +- include/clk.h | 15 + include/configs/sun4i.h | 4 - include/configs/sun50i.h | 5 - include/configs/sun5i.h | 4 - include/configs/sun6i.h | 4 - include/configs/sun7i.h | 4 - include/configs/sun8i.h | 4 - include/configs/sunxi-common.h | 5 +- include/reset.h | 52 ++ scripts/config_whitelist.txt | 2 - 143 files changed, 2566 insertions(+), 683 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/ccu.h create mode 100644 drivers/clk/sunxi/Kconfig create mode 100644 drivers/clk/sunxi/Makefile create mode 100644 drivers/clk/sunxi/clk_a10.c create mode 100644 drivers/clk/sunxi/clk_a10s.c create mode 100644 drivers/clk/sunxi/clk_a23.c create mode 100644 drivers/clk/sunxi/clk_a31.c create mode 100644 drivers/clk/sunxi/clk_a64.c create mode 100644 drivers/clk/sunxi/clk_a83t.c create mode 100644 drivers/clk/sunxi/clk_h3.c create mode 100644 drivers/clk/sunxi/clk_r40.c create mode 100644 drivers/clk/sunxi/clk_sunxi.c create mode 100644 drivers/clk/sunxi/clk_v3s.c create mode 100644 drivers/reset/reset-sunxi.c create mode 100644 drivers/spi/sun6i_spi.c delete mode 100644 drivers/usb/host/ehci-sunxi.c delete mode 100644 drivers/usb/host/ohci-sunxi.c -- 2.18.0.321.gffc6fa0e3

2 55

[U-Boot] [PATCH v2] fdt_support: Use VLA instead of MEMORY_BANKS_MAX
by Ramon Fried 13 Aug '18

13 Aug '18

Instead of relaying on user to configure MEMORY_BANKS_MAX correctly, use VLA (variable length array) to accommodate the required banks. Fixes: 2a1f4f1758b5 ("Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"") Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- Resending same patch but with the right email address common/fdt_support.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 34d2bd59c4..e8982367a0 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -409,19 +409,14 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, return p - (char *)buf; } -#define MEMORY_BANKS_MAX 4 int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { int err, nodeoffset; int len, i; - u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */ + u8 tmp[banks * 16]; /* Up to 64-bit address + 64-bit size */ - if (banks > MEMORY_BANKS_MAX) { - printf("%s: num banks %d exceeds hardcoded limit %d." - " Recompile with higher MEMORY_BANKS_MAX?\n", - __FUNCTION__, banks, MEMORY_BANKS_MAX); + if (!banks) return -1; - } err = fdt_check_header(blob); if (err < 0) { -- 2.18.0

2 2

[U-Boot] Pull request: u-boot-staging
by Anatolij Gustschin 13 Aug '18

13 Aug '18

Hi Tom, The following changes since commit a032e0a6aed208977f48e78d2cc497b91543beaf: travis: give every job a name (2018-08-10 13:50:30 -0400) are available in the git repository at: git://git.denx.de/u-boot-staging.git agust(a)denx.de for you to fetch changes up to 7e86242b2bdb2983423a3a1f3ec375df56c7cac8: misc: Add gdsys_ioep driver (2018-08-11 16:00:50 +0200) ---------------------------------------------------------------- Mario Six (4): misc: docs: Fix comments in misc.h misc: uclass: Add enable/disable function test: Add tests for misc uclass misc: Add gdsys_ioep driver .../devicetree/bindings/misc/gdsys,io-endpoint.txt | 20 ++ arch/sandbox/dts/test.dts | 4 + drivers/misc/Kconfig | 6 + drivers/misc/Makefile | 3 +- drivers/misc/gdsys_ioep.c | 209 +++++++++++++++++++++ drivers/misc/gdsys_ioep.h | 137 ++++++++++++++ drivers/misc/misc-uclass.c | 10 + drivers/misc/misc_sandbox.c | 133 +++++++++++++ include/misc.h | 109 +++++++---- test/dm/Makefile | 1 + test/dm/misc.c | 83 ++++++++ 11 files changed, 675 insertions(+), 40 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/gdsys,io-endpoint.txt create mode 100644 drivers/misc/gdsys_ioep.c create mode 100644 drivers/misc/gdsys_ioep.h create mode 100644 drivers/misc/misc_sandbox.c create mode 100644 test/dm/misc.c Please pull. Thanks! -- Anatolij

2 1

[U-Boot] Please pull u-boot-video/master
by Anatolij Gustschin 13 Aug '18

13 Aug '18

Hi Tom, The following changes since commit f05ebbf47a9dc863ff4bb084649ecb34d728b5f2: bcm968380gerg: Add MAINTAINERS file (2018-08-09 11:48:39 -0400) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 25a9f9747a84b36f61f575d592eddc96bce5dabb: video_display: Add Xilinx LogiCore DP TX (2018-08-11 09:18:44 +0200) ---------------------------------------------------------------- Mario Six (8): drivers: Add AXI uclass axi: Add ihs_axi driver axi: Add AXI sandbox driver and simple emulator sandbox: Add and build AXI bus and device test: Add AXI test cmd: Add axi command video: Sort Makefile entries video_display: Add Xilinx LogiCore DP TX .../devicetree/bindings/axi/gdsys,ihs_axi.txt | 22 + arch/sandbox/dts/sandbox.dts | 11 + arch/sandbox/dts/test.dts | 11 + arch/sandbox/include/asm/axi.h | 66 + cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/axi.c | 352 +++ configs/sandbox_defconfig | 3 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/axi/Kconfig | 32 + drivers/axi/Makefile | 12 + drivers/axi/axi-emul-uclass.c | 85 + drivers/axi/axi-uclass.c | 39 + drivers/axi/axi_sandbox.c | 77 + drivers/axi/ihs_axi.c | 293 +++ drivers/axi/sandbox_store.c | 123 ++ drivers/video/Kconfig | 11 + drivers/video/Makefile | 43 +- drivers/video/logicore_dp_dpcd.h | 341 +++ drivers/video/logicore_dp_tx.c | 2296 ++++++++++++++++++++ drivers/video/logicore_dp_tx.h | 54 + drivers/video/logicore_dp_tx_regif.h | 396 ++++ include/axi.h | 118 + include/dm/uclass-id.h | 2 + test/dm/Makefile | 1 + test/dm/axi.c | 77 + 27 files changed, 4456 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/axi/gdsys,ihs_axi.txt create mode 100644 arch/sandbox/include/asm/axi.h create mode 100644 cmd/axi.c create mode 100644 drivers/axi/Kconfig create mode 100644 drivers/axi/Makefile create mode 100644 drivers/axi/axi-emul-uclass.c create mode 100644 drivers/axi/axi-uclass.c create mode 100644 drivers/axi/axi_sandbox.c create mode 100644 drivers/axi/ihs_axi.c create mode 100644 drivers/axi/sandbox_store.c create mode 100644 drivers/video/logicore_dp_dpcd.h create mode 100644 drivers/video/logicore_dp_tx.c create mode 100644 drivers/video/logicore_dp_tx.h create mode 100644 drivers/video/logicore_dp_tx_regif.h create mode 100644 include/axi.h create mode 100644 test/dm/axi.c Please pull. Thanks! -- Anatolij

2 1

[U-Boot] [U-boot] 2018.09-rc1 Browsing source code of SPL and U-boot proper
by Sreekesh Sreelal 12 Aug '18

12 Aug '18

I am trying to study the execution flow of SPL and U-boot proper specifically for BeagleBone Black(am335x_boneblack_defconfig) by browsing through the source code. 1. How can i generate the list of source files which gets compiled into U-boot proper(u-boot.img) and SPL(MLO) binaries? If i get a list of files which gets compiled for SPL and U-boot separately, then i can use cscope to browse through the code. ( make cscope just generates the list of files which gets compiled for U-boot proper, and it includes many files which are not compiled into binary ) 2. How can i generate the configuration macros(CONFIG_*) which are used during build process of U-boot and SPL binaries? Is include/generated/autoconf.h containing the macros used for U-boot. 3. What does u-boot.cfg and spl/u-boot.cfg contain? Are these the configuration macros used for building U-boot and SPL respectively? Regards, Sreekesh Sreelal

1 0

[U-Boot] BUG num banks 8 exceeds hardcoded limit 4
by Anand Moon 12 Aug '18

12 Aug '18

Hi Lukasz / Minkyu, Today I wanted to test the latest u-boot on my Odroid-XU4 and I landed onto this bug and it failed to boot up. include/configs/odroid.h:#define CONFIG_NR_DRAM_BANKS 8 include/configs/odroid_xu3.h:#define CONFIG_NR_DRAM_BANKS 8 seem to the the issue. Well I have some local changes to enable MMC on u-boot and reset the mmc regulators on. which might not be related to this bug. U-Boot 2018.09-rc1-00165-ge966471562-dirty (Aug 09 2018 - 06:29:02 +0000) for ODROID-XU3/XU4/HC1 CPU: Exynos5422 @ 800 MHz Model: Odroid XU3 based on EXYNOS5422 Board: Odroid XU3 based on EXYNOS5422 Type: xu4 DRAM: 2 GiB LDO18@vdd_emmc_1V8: set 1800000 uV; enabling LDO3@vddq_mmc0: set 1800000 uV; enabling LDO13@vddq_mmc2: set 2800000 uV; enabling LDO19@vdd_sd: set 2800000 uV; enabling MMC: EXYNOS DWMMC: 0, EXYNOS DWMMC: 2 Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment Failed (-5) In: serial Out: serial Err: serial Net: No ethernet found. Hit any key to stop autoboot: 0 MMC Device 1 not found no mmc device at slot 1 Card did not respond to voltage select! switch to partitions #0, OK mmc2 is current device Scanning mmc 2:1... Found U-Boot script /boot.scr 3266 bytes read in 6 ms (531.3 KiB/s) ## Executing script at 50000000 Found kernel image: zImage 57082 bytes read in 8 ms (6.8 MiB/s) Found ramdisk image. 6484525 bytes read in 425 ms (14.6 MiB/s) 6713264 bytes read in 441 ms (14.5 MiB/s) Kernel image @ 0x40007fc0 [ 0x000000 - 0x666fb0 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: uInitrd Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 6484461 Bytes = 6.2 MiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 40800000 Booting using the fdt blob at 0x40800000 Loading Ramdisk to 4f9d0000, end 4ffff1ed ... OK Loading Device Tree to 4f9bf000, end 4f9cfef9 ... OK fdt_fixup_memory_banks: num banks 8 exceeds hardcoded limit 4. Recompile with higher MEMORY_BANKS_MAX? ERROR: arch-specific fdt fixup failed - must RESET the board to recover. FDT creation failed! hanging...### ERROR ### Please RESET the board ### Best Regards -Anand

3 3

[U-Boot] [PATCH 1/3] pinctrl: bcm6838: add pinctrl support
by Philippe Reynes 11 Aug '18

11 Aug '18

Add pinctrl support for broadcom bcm6838 SoC. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- .../pinctrl/bcm6838-pinctrl.txt | 35 +++++ drivers/pinctrl/broadcom/Kconfig | 8 ++ drivers/pinctrl/broadcom/Makefile | 1 + drivers/pinctrl/broadcom/pinctrl-bcm6838.c | 159 +++++++++++++++++++++ 4 files changed, 203 insertions(+) create mode 100644 doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt create mode 100644 drivers/pinctrl/broadcom/pinctrl-bcm6838.c diff --git a/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt b/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt new file mode 100644 index 0000000..e13d4e7 --- /dev/null +++ b/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt @@ -0,0 +1,35 @@ +* broadcom bcm6838 pinctrl + +Required properties for the pinctrl driver: +- compatible: "brcm,bcm6838-pinctrl" +- regmap: specify the gpio test port syscon +- pins-count: the number of pin +- functions-count: the number of function + +Please refer to pinctrl-bindings.txt in this directory for details of the +common pinctrl bindings used by client devices. + +Example: + + gpio_test_port: syscon@14e00294 { + compatible = "syscon"; + reg = <0x14e00294 0x1c>; + }; + + pinctrl: pinctrl { + compatible = "brcm,bcm6838-pinctrl"; + regmap = <&gpio_test_port>; + pins-count = <74>; + functions-count = <8>; + + usb0: usb0 { + usb0_pwrflt { + pins = "69"; + function = "1"; + }; + usb0_pwron { + pins = "70"; + function = "1"; + }; + }; + }; diff --git a/drivers/pinctrl/broadcom/Kconfig b/drivers/pinctrl/broadcom/Kconfig index 4056782..b01b725 100644 --- a/drivers/pinctrl/broadcom/Kconfig +++ b/drivers/pinctrl/broadcom/Kconfig @@ -5,3 +5,11 @@ config PINCTRL_BCM283X help Support pin multiplexing and pin configuration control on Broadcom's 283x family of SoCs. + +config PINCTRL_BCM6838 + depends on ARCH_BMIPS && PINCTRL_FULL && OF_CONTROL + default y + bool "Broadcom 6838 family pin control driver" + help + Support pin multiplexing and pin configuration control on + Broadcom's 6838 family of SoCs. diff --git a/drivers/pinctrl/broadcom/Makefile b/drivers/pinctrl/broadcom/Makefile index 99c7c23..f94f3ce 100644 --- a/drivers/pinctrl/broadcom/Makefile +++ b/drivers/pinctrl/broadcom/Makefile @@ -5,3 +5,4 @@ # https://spdx.org/licenses obj-$(CONFIG_PINCTRL_BCM283X) += pinctrl-bcm283x.o +obj-$(CONFIG_PINCTRL_BCM6838) += pinctrl-bcm6838.o diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm6838.c b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c new file mode 100644 index 0000000..2b8d849 --- /dev/null +++ b/drivers/pinctrl/broadcom/pinctrl-bcm6838.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <common.h> +#include <dm.h> +#include <regmap.h> +#include <syscon.h> +#include <dm/pinctrl.h> + +#define BCM6838_CMD_LOAD_MUX 0x21 + +#define BCM6838_FUNC_OFFS 12 +#define BCM6838_FUNC_MASK (0x37 << BCM6838_FUNC_OFFS) +#define BCM6838_PIN_OFFS 0 +#define BCM6838_PIN_MASK (0xfff << BCM6838_PIN_OFFS) + +#define BCM6838_MAX_PIN_NAME_LEN 8 +static char bcm6838_pin_name[BCM6838_MAX_PIN_NAME_LEN]; + +#define BCM6838_MAX_FUNC_NAME_LEN 8 +static char bcm6838_func_name[BCM6838_MAX_FUNC_NAME_LEN]; + +struct bcm6838_test_port_hw { + unsigned long port_blk_data1; + unsigned long port_blk_data2; + unsigned long port_command; +}; + +static const struct bcm6838_test_port_hw bcm6838_hw = { + .port_blk_data1 = 0x10, + .port_blk_data2 = 0x14, + .port_command = 0x18 +}; + +struct bcm6838_pinctrl_priv { + const struct bcm6838_test_port_hw *hw; + struct regmap *regmap; + u32 pins_count; + u32 functions_count; +}; + +int bcm6838_pinctrl_get_pins_count(struct udevice *dev) +{ + struct bcm6838_pinctrl_priv *priv = dev_get_priv(dev); + + return priv->pins_count; +} + +const char *bcm6838_pinctrl_get_pin_name(struct udevice *dev, + unsigned int selector) +{ + snprintf(bcm6838_pin_name, BCM6838_MAX_PIN_NAME_LEN, "%u", selector); + return bcm6838_pin_name; +} + +int bcm6838_pinctrl_get_functions_count(struct udevice *dev) +{ + struct bcm6838_pinctrl_priv *priv = dev_get_priv(dev); + + return priv->functions_count; +} + +const char *bcm6838_pinctrl_get_function_name(struct udevice *dev, + unsigned int selector) +{ + snprintf(bcm6838_func_name, BCM6838_MAX_FUNC_NAME_LEN, "%u", selector); + return bcm6838_func_name; +} + +int bcm6838_pinctrl_pinmux_set(struct udevice *dev, + unsigned int pin_selector, + unsigned int func_selector) +{ + struct bcm6838_pinctrl_priv *priv = dev_get_priv(dev); + const struct bcm6838_test_port_hw *hw = priv->hw; + unsigned int data; + + regmap_write(priv->regmap, hw->port_blk_data1, 0); + data = (func_selector << BCM6838_FUNC_OFFS) & BCM6838_FUNC_MASK; + data |= (pin_selector << BCM6838_PIN_OFFS) & BCM6838_PIN_MASK; + regmap_write(priv->regmap, hw->port_blk_data2, data); + regmap_write(priv->regmap, hw->port_command, BCM6838_CMD_LOAD_MUX); + + return 0; +} + +int bcm6838_pinctrl_probe(struct udevice *dev) +{ + struct bcm6838_pinctrl_priv *priv = dev_get_priv(dev); + const struct bcm6838_test_port_hw *hw = + (const struct bcm6838_test_port_hw *)dev_get_driver_data(dev); + int err; + u32 phandle; + ofnode node; + + err = ofnode_read_u32(dev_ofnode(dev), "regmap", &phandle); + if (err) { + dev_err(dev, "Unable to read regmap\n"); + goto out; + } + + node = ofnode_get_by_phandle(phandle); + if (!ofnode_valid(node)) { + dev_err(dev, "%s: Unable to find node\n", __func__); + err = -EINVAL; + goto out; + } + + priv->regmap = syscon_node_to_regmap(node); + if (!priv->regmap) { + dev_err(dev, "%s: Unable to find regmap\n", __func__); + err = -ENODEV; + goto out; + } + + err = ofnode_read_u32(dev_ofnode(dev), "pins-count", + &priv->pins_count); + if (err) { + dev_err(dev, "%s: Unable to read pins-count\n", __func__); + goto out; + } + + err = ofnode_read_u32(dev_ofnode(dev), "functions-count", + &priv->functions_count); + if (err) { + dev_err(dev, "%s: Unable to read functions-count\n", __func__); + goto out; + } + + priv->hw = hw; + + out: + return err; +} + +const struct pinctrl_ops bcm6838_pinctrl_ops = { + .set_state = pinctrl_generic_set_state, + .get_pins_count = bcm6838_pinctrl_get_pins_count, + .get_pin_name = bcm6838_pinctrl_get_pin_name, + .get_functions_count = bcm6838_pinctrl_get_functions_count, + .get_function_name = bcm6838_pinctrl_get_function_name, + .pinmux_set = bcm6838_pinctrl_pinmux_set, +}; + +static const struct udevice_id bcm6838_pinctrl_match[] = { + { + .compatible = "brcm,bcm6838-pinctrl", + .data = (ulong)&bcm6838_hw, + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(bcm6838_pinctrl) = { + .name = "bcm6838_pinctrl", + .id = UCLASS_PINCTRL, + .of_match = bcm6838_pinctrl_match, + .ops = &bcm6838_pinctrl_ops, + .priv_auto_alloc_size = sizeof(struct bcm6838_pinctrl_priv), + .probe = bcm6838_pinctrl_probe, +}; -- 2.7.4

2 3

[U-Boot] [PATCH] ARM: configs: Add da850evm_nand to boot from NAND
by Adam Ford 11 Aug '18

11 Aug '18

The DA850-EVM supports booting from NAND when used with the UI expander board. da850evm_nand will create an ais file that can be burned to NAND and booted while storing the env in NAND along with some partitions tables for storing kernel, dtb and rootfs in NAND. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/davinci/da8xxevm/MAINTAINERS b/board/davinci/da8xxevm/MAINTAINERS index 99b4786dd5..59589867b3 100644 --- a/board/davinci/da8xxevm/MAINTAINERS +++ b/board/davinci/da8xxevm/MAINTAINERS @@ -5,6 +5,7 @@ F: board/davinci/da8xxevm/ F: include/configs/da850evm.h F: configs/da850_am18xxevm_defconfig F: configs/da850evm_defconfig +F: configs/da850evm_nand_defconfig F: configs/da850evm_direct_nor_defconfig OMAPL138_LCDK BOARD diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig new file mode 100644 index 0000000000..a0d5cf7a27 --- /dev/null +++ b/configs/da850evm_nand_defconfig @@ -0,0 +1,60 @@ +CONFIG_ARM=y +CONFIG_ARCH_DAVINCI=y +CONFIG_SYS_TEXT_BASE=0xc1080000 +CONFIG_TARGET_DA850EVM=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="da850-evm" +CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" +CONFIG_BOOTDELAY=3 +CONFIG_VERSION_VARIABLE=y +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SPI_LOAD=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot > " +CONFIG_CRC32_VERIFY=y +# CONFIG_CMD_EEPROM is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_GPT is not set +CONFIG_CMD_NAND=y +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_TIME is not set +# CONFIG_CMD_EXT4 is not set +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=nand512" +CONFIG_MTDPARTS_DEFAULT="mtdparts=nand512:128k(u-boot env),256k(u-boot),128k(spl-os),8m(kernel),-(rootfs)" +CONFIG_CMD_DIAG=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM=y +CONFIG_DM_GPIO=y +CONFIG_DA8XX_GPIO=y +CONFIG_DM_I2C=y +CONFIG_MTD_PARTITIONS=y +CONFIG_NAND=y +CONFIG_NAND_DAVINCI=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 +CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y +# CONFIG_FAT_WRITE is not set +CONFIG_USE_TINY_PRINTF=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3dcd1390ca..93aa02cfa0 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -37,6 +37,7 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) +#define CONFIG_SKIP_LOWLEVEL_INIT #ifdef CONFIG_DIRECT_NOR_BOOT #define CONFIG_ARCH_CPU_INIT @@ -149,8 +150,11 @@ * Flash & Environment */ #ifdef CONFIG_NAND +#ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) +#define CONFIG_ENV_SECT_SIZE (128 << 10) +#endif #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K @@ -164,8 +168,7 @@ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE (2 << 10) #define CONFIG_SYS_NAND_BLOCK_SIZE (128 << 10) -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x28000 -#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x60000 +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x40000 #define CONFIG_SYS_NAND_U_BOOT_DST 0xc1080000 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST #define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_DST - \ @@ -215,9 +218,11 @@ #endif #ifdef CONFIG_USE_SPIFLASH +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) #define CONFIG_ENV_OFFSET (512 << 10) -#define CONFIG_ENV_SECT_SIZE (64 << 10) +#define CONFIG_ENV_SECT_SIZE (64 << 10) +#endif #ifdef CONFIG_SPL_BUILD #undef CONFIG_SPI_FLASH_MTD #endif -- 2.17.1

1 0

[U-Boot] [PATCH 1/1] efi_selftest: correct block device unit test
by Heinrich Schuchardt 11 Aug '18

11 Aug '18

The UEFI specification mandates that the create flag is only used in conjunction with both the read and the write flag. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/efi_selftest_block_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index b82e405030..1cd13042e9 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -415,7 +415,7 @@ static int execute(void) #ifdef CONFIG_FAT_WRITE /* Write file */ - ret = root->open(root, &file, (s16 *)L"u-boot.txt", + ret = root->open(root, &file, (s16 *)L"u-boot.txt", EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE, 0); if (ret != EFI_SUCCESS) { efi_st_error("Failed to open file\n"); -- 2.18.0

1 1