March 2017 - U-Boot

[U-Boot] [PATCH v3 0/6] sunxi: video: Add support for HDMI output on A64/H3/H5
by Jernej Skrabec 28 Apr '17

28 Apr '17

This series implements support for HDMI output. This is done using DM video framework and sharing the HDMI controller code with RK3288. Patch 1 splits out TCON code which is completely reusable on all Allwinner SoCs. Patch 2 converts common TCON code to use DM video compatible timing structure. Patch 3 adds all necessary clocks which are needed for Display Engine 2, TCON and HDMI. Patch 4 implement actual DE2 and HDMI driver and patch 5 disables HDMI on all boards which don't have it (default is on). Patch 6 is included here only for testing HDMI output on A64 due to missing power regulator support (AXP803). Another option is to use ATF which powers on HDMI. Such ATF can be found on Andre Przywara's github. Code was tested on OrangePi 2 & OrangePi Plus 2E (both H3), OrangePi PC 2 (H5) and Pine64 (A64). It was tested on A10, A13 and A20 boards by others. This series was developed on u-boot-sunxi repository with additional, not yet merged, patch: https://patchwork.ozlabs.org/patch/735617/ All Rockchip patches were already merged to u-boot-rockchip repository and are not yet present in u-boot-sunxi. They have to be cherry picked: a0a2774aebdaa039ce787090c903cf47263f04c9 520c174b3564ae183f0e7c118dc8ce3770ae20b0 3bffe88d68e43b7bead12ef8020267fabc6c7ebf Best regards, Jernej Skrabec Changes in v3: - drop patch 1 because it was merged - changed video output to 32 bpp - collect acked by tags - convert preprocessor symbol to Kconfig option (patch 3) - Kconfig option in patch 4 depends on new option Changes in v2: - patch 1 & 2 were removed because they were merged - collect reviewed by and tested by tags - TCON split out patch is splitted in two patches - fixed lcdc_enable() calls in video driver for old SoCs - defconfigs should disable video driver, not enable it - minor constant style fix Icenowy Zheng (1): [DO NOT MERGE] sunxi: add AXP803 support Jernej Skrabec (5): sunxi: video: Split out TCON code sunxi: video: Convert lcdc to use struct display_timing sunxi: Add clock support for DE2/HDMI/TCON on newer SoCs sunxi: video: Add A64/H3/H5 HDMI driver sunxi: Disable DE2 video driver where not needed arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 54 ++++ arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 8 + arch/arm/include/asm/arch-sunxi/display.h | 103 ------- arch/arm/include/asm/arch-sunxi/display2.h | 124 ++++++++ arch/arm/include/asm/arch-sunxi/lcdc.h | 128 +++++++++ arch/arm/mach-sunxi/Makefile | 3 + arch/arm/mach-sunxi/clock_sun6i.c | 40 ++- arch/arm/mach-sunxi/pmic_bus.c | 6 +- arch/arm/mach-sunxi/rsb.c | 2 +- board/sunxi/Kconfig | 16 ++ board/sunxi/board.c | 31 +- configs/nanopi_neo_air_defconfig | 1 + configs/nanopi_neo_defconfig | 1 + configs/orangepi_zero_defconfig | 1 + drivers/power/Kconfig | 87 +++--- drivers/power/Makefile | 1 + drivers/power/axp803.c | 256 +++++++++++++++++ drivers/power/axp818.c | 2 +- drivers/video/Makefile | 2 +- drivers/video/sunxi/Makefile | 9 + drivers/video/sunxi/lcdc.c | 209 ++++++++++++++ drivers/video/sunxi/sunxi_de2.c | 258 +++++++++++++++++ drivers/video/{ => sunxi}/sunxi_display.c | 220 +++------------ drivers/video/sunxi/sunxi_dw_hdmi.c | 389 ++++++++++++++++++++++++++ include/axp803.h | 73 +++++ include/axp_pmic.h | 3 + include/configs/sunxi-common.h | 5 + 27 files changed, 1701 insertions(+), 331 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/display2.h create mode 100644 arch/arm/include/asm/arch-sunxi/lcdc.h create mode 100644 drivers/power/axp803.c create mode 100644 drivers/video/sunxi/Makefile create mode 100644 drivers/video/sunxi/lcdc.c create mode 100644 drivers/video/sunxi/sunxi_de2.c rename drivers/video/{ => sunxi}/sunxi_display.c (87%) create mode 100644 drivers/video/sunxi/sunxi_dw_hdmi.c create mode 100644 include/axp803.h -- 2.12.1

3 16

[U-Boot] regression: setting the rpi mac address stopped working
by Gerd Hoffmann 26 Apr '17

26 Apr '17

Hi, u-boot 2016.11 & newer doesn't set the mac address on my raspberry pi any more, so the linux kernel picks a random mac address. Bisected to this commit: commit b91c6a1209e7da1a7f989d9ac35d0d8be0b7b710 Author: Simon Glass <sjg(a)chromium.org> Date: Wed Oct 5 20:42:11 2016 -0600 Fix return value in trailing_strtoln() This function should return -1 if there is no trailing integer in the string. Instead it returns 0. Fix it by checking for this condition at the start. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Appearently this change broke fdt_fixup_ethernet(). cheers, Gerd

4 4

[U-Boot] U-Boot of-platdata issue
by Kever Yang 25 Apr '17

25 Apr '17

Hi Simon, I met two issue when using of-platdata 1. compitable name with '.' I get compile error as below: In file included from include/dt-structs.h:16:0, from spl/dts/dt-platdata.c:3: include/generated/dt-structs.h:26:35: error: expected identifier or ‘(’ before numeric constant struct dtd_rockchip_rk3399_sdhci_5.1 { ^ spl/dts/dt-platdata.c:41:42: error: expected identifier or ‘(’ before numeric constant static struct dtd_rockchip_rk3399_sdhci_5.1 dtv_sdhci_at_fe330000 = { ^ spl/dts/dt-platdata.c:55:15: error: ‘dtv_sdhci_at_fe330000’ undeclared here (not in a function) .platdata = &dtv_sdhci_at_fe330000, ^ make[2]: *** [spl/dts/dt-platdata.o] Error 1 make[1]: *** [spl/u-boot-spl] Error 2 make: *** [__build_one_by_one] Error 2 The dts node starts like this: sdhci: sdhci@fe330000 { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; ... 2. multi compatible name When a dts node have more than one compatible name, which is prefer to use? for example, we have two dwmmc compatible name in rk3399, the tool is using the first one, while the source code using the last one. "drivers/mmc/rockchip_dw_mmc.c" 23 struct rockchip_mmc_plat { 24 #if CONFIG_IS_ENABLED(OF_PLATDATA) 25 struct dtd_rockchip_rk3288_dw_mshc dtplat; 26 #endif 27 struct mmc_config cfg; 28 struct mmc mmc; 29 }; ... dts node sdmmc: dwmmc@fe320000 { compatible = "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc"; ... Thanks, - Kever

3 6

[U-Boot] [PATCH v3 00/19] SPL: extend FIT loading support
by Andre Przywara 24 Apr '17

24 Apr '17

Some minor fixes version of the SPL FIT loading series and the respective patches to enable this feature on 64-bit Allwinner SoCs. There is a new patch (6/19) fixing the SPL_FIT dependencies, above all selecting SPL_OF_LIBFDT when SPL_FIT is enabled. This reduces the number of Kconfig symbols a board has to select for the SPL fit loading from four down to two, which leads to changes in the final patches enabling this feature. Compared to the previous version the SPL FIT loading is now selected in the Kconfig for both 64-bit sunxi SoCs, so there is less burden on each individual defconfig. Also following Olliver's suggestion a symbol in mksunxiboot has been renamed. --- The first five patches introduce the core of the extened SPL FIT loading support, see below for a description. Patch 6 fixes a Kconfig dependency to simplify the usage of this option. Patches 7-10 make some room in the sunxi 64-bit SPL to allow compiling in the FIT loading bits. Patch 11 and 12 let the SPL choose the proper DT from the FIT image. The next two patches add the infrastructure and an actual generator script, so the FIT image is automatically created at build time. Patches 14 and 15 enable the SPL FIT support for Allwinner 64-bit SoCs in general and for the Pine64 and OrangePi PC 2 in particular. The following two patches store a DT file name in the SPL header, so U-Boot can easily pick the proper DT when scanning the FIT image. The idea is that this DT name should stay with the board, ideally on eMMC or SPI flash. So both U-Boot and a firmware update tool could identify a board, updating with compatible firmware while keeping the DT name in place. Ideally a board vendor would once seed this name onto on-board storage like SPI flash. I kept those two patches in, as the work on replacing mksunxiboot with an mkimage extension is not ready yet. Feel free to drop those from the series if this is a problem. The final patch updates the Pine64 README file to document the current way of building U-Boot, which now includes the ARM Trusted Firmware build in its image. I would be delighted if that series can make it into the next release, as this finally enables the fully open source firmware for the 64-bit Allwinner SoCs (including the ATF binary). This series is based on sunxi/master, rebased upon origin/master. Cheers, Andre. ------- Currently the FIT format is not used to its full potential in the SPL: It only loads the first image from the /images node and appends the proper FDT. Some boards and platforms would benefit from loading more images before starting U-Boot proper, notably Allwinner A64 and ARMv8 Rockchip boards, which use an ARM Trusted Firmware (ATF) image to be executed before U-Boot. This series tries to solve this in a board agnostic and generic way: We extend the SPL FIT loading scheme to allow loading multiple images. So apart from loading the image which is referenced by the "firmware" property in the respective configuration node and placing the DTB right behind it, we iterate over all strings in the "loadable" property. Each image referenced there will be loaded to its specified load address. The entry point U-Boot eventually branches to will be taken from the first image to explicitly provide the "entry" property, or, if none of them does so, from the load address of the "firmware" image. This keeps the scheme compatible with the FIT images our Makefile creates automatically at the moment. Apart from the already mentioned ATF scenario this opens up more usage scenarios, of which the commit message of patch 04/11 lists some. The remaining patches prepare ane finally enable this scheme for the 64-bit Allwinner boards. Andre Przywara (18): SPL: FIT: refactor FDT loading SPL: FIT: rework U-Boot image loading SPL: FIT: improve error handling SPL: FIT: factor out spl_load_fit_image() SPL: FIT: allow loading multiple images Kconfig: fix SPL_FIT dependency tools: mksunxiboot: allow larger SPL binaries armv8: SPL: only compile GIC code if needed armv8: fsl: move ccn504 code into FSL Makefile sunxi: A64: move SPL stack to end of SRAM A2 sunxi: SPL: store RAM size in gd sunxi: SPL: add FIT config selector for Pine64 boards Makefile: add rules to generate SPL FIT images sunxi: 64-bit SoCs: introduce FIT generator script sunxi: defconfig: add supported DT list for Pine64 and OrangePi PC 2 sunxi: enable automatic FIT build for 64-bit SoCs sunxi: use SPL header DT name for FIT board matching sunxi: update Pine64 README Siarhei Siamashka (1): sunxi: Store the device tree name in the SPL header Kconfig | 22 ++- Makefile | 20 +++ arch/arm/include/asm/arch-sunxi/spl.h | 19 ++- arch/arm/lib/Makefile | 4 +- board/sunxi/Kconfig | 4 + board/sunxi/README.pine64 | 177 +++++++++++++------- board/sunxi/board.c | 36 +++- board/sunxi/mksunxi_fit_atf.sh | 73 +++++++++ common/spl/spl_fit.c | 298 ++++++++++++++++++++++------------ configs/am335x_evm_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 + configs/pine64_plus_defconfig | 1 + doc/uImage.FIT/howto.txt | 21 +++ include/configs/sunxi-common.h | 17 +- scripts/Makefile.spl | 3 +- tools/mksunxiboot.c | 53 +++++- 17 files changed, 562 insertions(+), 189 deletions(-) create mode 100755 board/sunxi/mksunxi_fit_atf.sh -- 2.8.2

9 45

[U-Boot] [PATCH 00/22] x86: Add ACPI S3 resume support
by Bin Meng 24 Apr '17

24 Apr '17

This adds ACPI S3 (suspend to ram) resume capability in U-Boot. With S3 support within U-Boot, the board wakes up and resumes to OS very quickly. This so far is enabled and tested on Intel MinnowMax board. Please check README.x86 for how to test it with a plain Linux kernel. Note testing with Ubuntu or Windows has some issues and fixes are still being worked out. This series is available for testing in u-boot-x86/s3-working. Bin Meng (22): dm: rtc: Add 16-bit read/write support x86: acpi: Add Kconfig option and header file for ACPI resume x86: baytrail: acpi: Add APIs for determining/clearing sleep state x86: Add post codes for OS resume x86: fsp: acpi: Pass different boot mode to FSP init x86: Store and display previous sleep state x86: baytrail: Conditionally report S3 in the ACPI table x86: fsp: Mark memory used by U-Boot as reserved in the E820 table for S3 x86: acpi: Add wake up assembly stub x86: acpi: Add one API to find OS wakeup vector x86: acpi: Resume OS if resume vector is found x86: Add an early CMOS access library x86: fsp: Save stack address to CMOS for next S3 boot x86: fsp: Mark the first 64K low memory as reserved x86: Adjust board_final_cleanup() order x86: apci: Change PM1_CNT register access to RMW x86: acpi: Make enter_acpi_mode() public x86: acpi: Refactor acpi_resume() x86: acpi: Turn on ACPI mode for S3 x86: pci: Allow conditionally run VGA rom in S3 x86: minnowmax: Enable ACPI S3 resume x86: Document ACPI S3 support arch/x86/Kconfig | 32 ++++++ arch/x86/cpu/Makefile | 1 + arch/x86/cpu/baytrail/acpi.c | 47 +++++++++ arch/x86/cpu/cpu.c | 26 ++++- arch/x86/cpu/wakeup.S | 79 ++++++++++++++ arch/x86/include/asm/acpi_s3.h | 116 +++++++++++++++++++++ arch/x86/include/asm/acpi_table.h | 3 + .../include/asm/arch-baytrail/acpi/sleepstates.asl | 2 + arch/x86/include/asm/arch-baytrail/iomap.h | 24 +++++ arch/x86/include/asm/cmos_layout.h | 31 ++++++ arch/x86/include/asm/early_cmos.h | 43 ++++++++ arch/x86/include/asm/global_data.h | 3 + arch/x86/include/asm/post.h | 2 + arch/x86/include/asm/tables.h | 1 + arch/x86/include/asm/u-boot-x86.h | 1 + arch/x86/lib/Makefile | 2 + arch/x86/lib/acpi_s3.c | 34 ++++++ arch/x86/lib/acpi_table.c | 84 ++++++++++++++- arch/x86/lib/early_cmos.c | 51 +++++++++ arch/x86/lib/fsp/fsp_common.c | 55 +++++++++- arch/x86/lib/fsp/fsp_dram.c | 24 +++++ configs/minnowmax_defconfig | 1 + doc/README.x86 | 20 ++-- drivers/pci/pci_rom.c | 14 +++ drivers/rtc/rtc-uclass.c | 30 ++++++ include/rtc.h | 20 ++++ 26 files changed, 735 insertions(+), 11 deletions(-) create mode 100644 arch/x86/cpu/wakeup.S create mode 100644 arch/x86/include/asm/acpi_s3.h create mode 100644 arch/x86/include/asm/cmos_layout.h create mode 100644 arch/x86/include/asm/early_cmos.h create mode 100644 arch/x86/lib/acpi_s3.c create mode 100644 arch/x86/lib/early_cmos.c -- 2.9.2

3 57

[U-Boot] [PATCH v1] env_mmc: configure environment offsets via device tree
by Philipp Tomsich 24 Apr '17

24 Apr '17

This introduces the ability to override the environment offets from the device tree by setting the following nodes in '/config': 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET 'u-boot,mmc-env-offset-redundant' - overrides CONFIG_ENV_OFFSET_REDUND To keep with the previous logic, the CONFIG_* defines still need to be available and the statically defined values become the defaults, when the corresponding properties are not set in the device-tree. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/env_mmc.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index 16f6a17..ef3dbd1 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -1,24 +1,25 @@ /* * (C) Copyright 2008-2011 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ #include <common.h> #include <command.h> #include <environment.h> +#include <fdtdec.h> #include <linux/stddef.h> #include <malloc.h> #include <memalign.h> #include <mmc.h> #include <search.h> #include <errno.h> #if defined(CONFIG_ENV_SIZE_REDUND) && \ (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE) #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE #endif @@ -36,21 +37,43 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_ENV_OFFSET 0 #endif -__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +#ifdef CONFIG_OF_LIBFDT +static inline s64 mmc_offset(int copy) { - s64 offset; + const char *propname = "u-boot,mmc-env-offset"; + s64 defvalue = CONFIG_ENV_OFFSET; - offset = CONFIG_ENV_OFFSET; -#ifdef CONFIG_ENV_OFFSET_REDUND +#if defined(CONFIG_ENV_OFFSET_REDUND) + if (copy) { + propname = "u-boot,mmc-env-offset-redundant"; + defvalue = CONFIG_ENV_OFFSET_REDUND; + } +#endif + + return fdtdec_get_config_int(gd->fdt_blob, propname, defvalue); +} +#else +static inline s64 mmc_offset(int copy) +{ + s64 offset = CONFIG_ENV_OFFSET; + +#if defined(CONFIG_ENV_OFFSET_REDUND) if (copy) offset = CONFIG_ENV_OFFSET_REDUND; #endif + return offset; +} +#endif + +__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +{ + s64 offset = mmc_offset(copy); if (offset < 0) offset += mmc->capacity; *env_addr = offset; return 0; } -- 1.9.1

5 13

[U-Boot] [PATCH v1] mmc: sdhci: SDHCI controllers also need power
by Andy Shevchenko 23 Apr '17

23 Apr '17

On some systems SDHCI controllers may be powered off and it's required to bring them on before accessing. SDHCI generic driver currently lacks any mean of doing it. Call the same board_power_mmc_init() at sdhci_init() stage. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/mmc/sdhci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 93cefd89cd..54a7e379ff 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -469,6 +469,8 @@ static int sdhci_init(struct mmc *mmc) { struct sdhci_host *host = mmc->priv; + board_mmc_power_init(); + sdhci_reset(host, SDHCI_RESET_ALL); if ((host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) && !aligned_buffer) { -- 2.11.0

4 17

[U-Boot] [PATCH 0/7] board: sama5d2_xplained: improves
by Wenyou Yang 22 Apr '17

22 Apr '17

Update to make SPL work, enable the early debug UART work in SPL, convert MACB to support driver model, and some miscs removals. Wenyou Yang (7): ARM: dts: sama5d2: add clock property for uart1 node ARM: dts: sama5d2_xplained: update for SPL configs: sama5d2_xplained: enable CONFIG_DM_ETH board: sama5d2_xplained: clean up macb init code board: sama5d2_xplained: remove uart1 init board: sama5d2_xplained: remove unnecessary header files configs: sama5d2_xplained: update for SPL arch/arm/dts/at91-sama5d2_xplained.dts | 12 ++++++ arch/arm/dts/sama5d2.dtsi | 22 +++++++++++ board/atmel/sama5d2_xplained/sama5d2_xplained.c | 49 +------------------------ configs/sama5d2_xplained_mmc_defconfig | 10 ++++- configs/sama5d2_xplained_spiflash_defconfig | 9 ++++- include/configs/sama5d2_xplained.h | 19 ++-------- 6 files changed, 56 insertions(+), 65 deletions(-) -- 2.11.0

2 14

[U-Boot] [PATCH] board: sama5d4ek: fix DD2 configuration
by Wenyou Yang 22 Apr '17

22 Apr '17

Fix the DDR2 configuration to make SPL work. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- arch/arm/mach-at91/include/mach/atmel_mpddrc.h | 7 ++++++- board/atmel/sama5d4ek/sama5d4ek.c | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h index f6bcecda38..803501f5cf 100644 --- a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h +++ b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h @@ -186,9 +186,14 @@ int ddr3_init(const unsigned int base, #define ATMEL_MPDDRC_IO_CALIBR_DDR3_RZQ_73 0x6 #define ATMEL_MPDDRC_IO_CALIBR_DDR3_RZQ_110 0x7 -#define ATMEL_MPDDRC_IO_CALIBR_TZQIO 0x7f +#define ATMEL_MPDDRC_IO_CALIBR_TZQIO (0x7f << 8) #define ATMEL_MPDDRC_IO_CALIBR_TZQIO_(x) (((x) & 0x7f) << 8) +#define ATMEL_MPDDRC_IO_CALIBR_CALCODEP (0xf << 16) +#define ATMEL_MPDDRC_IO_CALIBR_CALCODEP_(x) (((x) & 0xf) << 16) +#define ATMEL_MPDDRC_IO_CALIBR_CALCODEN (0xf << 20) +#define ATMEL_MPDDRC_IO_CALIBR_CALCODEN_(x) (((x) & 0xf) << 20) + #define ATMEL_MPDDRC_IO_CALIBR_EN_CALIB (0x1 << 4) /* Bit field in Read Data Path Register */ diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index d1b5ff5797..8eec0e88a5 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -349,7 +349,6 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) ATMEL_MPDDRC_CR_NR_ROW_14 | ATMEL_MPDDRC_CR_CAS_DDR_CAS3 | ATMEL_MPDDRC_CR_NB_8BANKS | - ATMEL_MPDDRC_CR_NDQS_DISABLED | ATMEL_MPDDRC_CR_DECOD_INTERLEAVED | ATMEL_MPDDRC_CR_UNAL_SUPPORTED); @@ -379,6 +378,8 @@ static void ddr2_conf(struct atmel_mpddrc_config *ddr2) void mem_init(void) { struct atmel_mpddrc_config ddr2; + const struct atmel_mpddr *mpddr = (struct atmel_mpddr *)ATMEL_BASE_MPDDRC; + u32 tmp; ddr2_conf(&ddr2); @@ -386,6 +387,19 @@ void mem_init(void) at91_periph_clk_enable(ATMEL_ID_MPDDRC); at91_system_clk_enable(AT91_PMC_DDR); + tmp = ATMEL_MPDDRC_RD_DATA_PATH_SHIFT_ONE_CYCLE; + writel(tmp, &mpddr->rd_data_path); + + tmp = readl(&mpddr->io_calibr); + tmp = (tmp & ~(ATMEL_MPDDRC_IO_CALIBR_RDIV | + ATMEL_MPDDRC_IO_CALIBR_TZQIO | + ATMEL_MPDDRC_IO_CALIBR_CALCODEP | + ATMEL_MPDDRC_IO_CALIBR_CALCODEN)) | + ATMEL_MPDDRC_IO_CALIBR_DDR2_RZQ_52 | + ATMEL_MPDDRC_IO_CALIBR_TZQIO_(8) | + ATMEL_MPDDRC_IO_CALIBR_EN_CALIB; + writel(tmp, &mpddr->io_calibr); + /* DDRAM2 Controller initialize */ ddr2_init(ATMEL_BASE_MPDDRC, ATMEL_BASE_DDRCS, &ddr2); } -- 2.11.0

2 1

[U-Boot] [PATCH v2] configs: sama5d3xek: add default config for CMP board
by Wenyou Yang 22 Apr '17

22 Apr '17

The sama5d36ek CMP board is the variant of sama5d3xek board. It is equipped with the low-power DDR2 SDRAM, PMIC ACT8865, and some power rails. The board is mainly used to measure the power consumption. As all those changes are done in at91bootstrap, in U-Boot, only use another device tree file, no code needed to change. As there is additional power consumption when enbling the USB Host and USB device, for the power consumption measurement intention, disable the USB host and device. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- The patch is based on [PATCH v4 0/6] board: sama5d3: convert boards to support DM/DT https://lists.denx.de/pipermail/u-boot/2017-March/284732.html Changes in v2: - Remove the SPL config options. - Convert MACB to support driver model. - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early debug UART. configs/sama5d36ek_cmp_mmc_defconfig | 51 ++++++++++++++++++++++++++++++ configs/sama5d36ek_cmp_nandflash_defconfig | 51 ++++++++++++++++++++++++++++++ configs/sama5d36ek_cmp_spiflash_defconfig | 51 ++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 configs/sama5d36ek_cmp_mmc_defconfig create mode 100644 configs/sama5d36ek_cmp_nandflash_defconfig create mode 100644 configs/sama5d36ek_cmp_spiflash_defconfig diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig new file mode 100644 index 0000000000..32a21f9294 --- /dev/null +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -0,0 +1,51 @@ +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +CONFIG_BOOTDELAY=3 +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y +CONFIG_AT91_UTMI=y +CONFIG_AT91_H32MX=y +CONFIG_DM_GPIO=y +CONFIG_AT91_GPIO=y +CONFIG_DM_MMC=y +CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_DM_ETH=y +CONFIG_MACB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_AT91=y +CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=132000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_ATMEL_USART=y +CONFIG_DM_SPI=y +CONFIG_ATMEL_SPI=y +CONFIG_LCD=y diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig new file mode 100644 index 0000000000..34c4de17b9 --- /dev/null +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -0,0 +1,51 @@ +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +CONFIG_BOOTDELAY=3 +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y +CONFIG_AT91_UTMI=y +CONFIG_AT91_H32MX=y +CONFIG_DM_GPIO=y +CONFIG_AT91_GPIO=y +CONFIG_DM_MMC=y +CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_DM_ETH=y +CONFIG_MACB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_AT91=y +CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=132000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_ATMEL_USART=y +CONFIG_DM_SPI=y +CONFIG_ATMEL_SPI=y +CONFIG_LCD=y diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig new file mode 100644 index 0000000000..42c31111a1 --- /dev/null +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -0,0 +1,51 @@ +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" +CONFIG_BOOTDELAY=3 +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y +CONFIG_AT91_UTMI=y +CONFIG_AT91_H32MX=y +CONFIG_DM_GPIO=y +CONFIG_AT91_GPIO=y +CONFIG_DM_MMC=y +CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_DM_ETH=y +CONFIG_MACB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_AT91=y +CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=132000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_ATMEL_USART=y +CONFIG_DM_SPI=y +CONFIG_ATMEL_SPI=y +CONFIG_LCD=y -- 2.11.0

2 1