January 2016 - U-Boot

[U-Boot] [PATCH 0/3] Add support for st33zp24 i2c and spi TPMs
by Christophe Ricard 21 Jan '16

21 Jan '16

Hi Simon, After a first tentative in August 2015: http://lists.denx.de/pipermail/u-boot/2015-August/222596.html I finally found some spare time for a new round to send a new patchset version bringing support for ST33ZP24 TPM 1.2 with i2c and spi support. I have been able to follow all your guidance from my previous tentative and got able to convert omap24xx_i2c and omap3_spi drivers to DM. I will send them in a separate patchset as an RFC for your review. Best Regards Christophe Christophe Ricard (3): tpm: Rename tpm_tis_infineon.h to tpm_tis.h and move infineon specific stuff in tpm_infineon.c tpm: st33zp24: Add tpm st33zp24 support with i2c tpm: st33zp24: Add tpm st33zp24 spi support README | 11 + drivers/tpm/Kconfig | 18 + drivers/tpm/Makefile | 2 + drivers/tpm/{tpm_tis_infineon.h => tpm_tis.h} | 17 +- drivers/tpm/tpm_tis_infineon.c | 17 +- drivers/tpm/tpm_tis_st33zp24_i2c.c | 543 +++++++++++++++++++++ drivers/tpm/tpm_tis_st33zp24_spi.c | 672 ++++++++++++++++++++++++++ 7 files changed, 1263 insertions(+), 17 deletions(-) rename drivers/tpm/{tpm_tis_infineon.h => tpm_tis.h} (86%) create mode 100644 drivers/tpm/tpm_tis_st33zp24_i2c.c create mode 100644 drivers/tpm/tpm_tis_st33zp24_spi.c -- 2.5.0

2 6

[U-Boot] [PATCH 1/2] serial: zynq: Extend compatible string list
by Michal Simek 21 Jan '16

21 Jan '16

From: Michal Simek <monstr(a)monstr.eu> ZynqMP is using updated core with cdns,uart-r1p12 compatible string. Signed-off-by: Michal Simek <monstr(a)monstr.eu> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/serial/serial_zynq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 3430482f8d8b..112a7a27b875 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -177,6 +177,7 @@ static const struct dm_serial_ops zynq_serial_ops = { static const struct udevice_id zynq_serial_ids[] = { { .compatible = "xlnx,xuartps" }, { .compatible = "cdns,uart-r1p8" }, + { .compatible = "cdns,uart-r1p12" }, { } }; -- 1.9.1

2 2

[U-Boot] [PATCH 1/3] dm: timer: refuse timers with zero clock_rate
by Stephen Warren 21 Jan '16

21 Jan '16

From: Stephen Warren <swarren(a)nvidia.com> If a timer has a zero clock_rate, get_tbclk() will return zero for it, which will cause tick_to_time() to perform a division-by-zero, which will crash U-Boot. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/timer/timer-uclass.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index aca421bdea33..0771562c600d 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -47,6 +47,16 @@ static int timer_pre_probe(struct udevice *dev) return 0; } +static int timer_post_probe(struct udevice *dev) +{ + struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); + + if (!uc_priv->clock_rate) + return -EINVAL; + + return 0; +} + u64 timer_conv_64(u32 count) { /* increment tbh if tbl has rolled over */ @@ -60,5 +70,6 @@ UCLASS_DRIVER(timer) = { .id = UCLASS_TIMER, .name = "timer", .pre_probe = timer_pre_probe, + .post_probe = timer_post_probe, .per_device_auto_alloc_size = sizeof(struct timer_dev_priv), }; -- 2.6.4

3 12

[U-Boot] [PATCH v3 0/8] dm: x86: Remove pirq_init() and cpu_irq_init()
by Simon Glass 21 Jan '16

21 Jan '16

This series adds an interrupt driver for x86. Since different platforms can implement this in their own way, we no-longer need the platform-specific weak function. We can also dispense with the arch_misc_init() call in some cases. Changes in v3: - Add new patch to use the IRQ device when setting up the mptable - Add new patch to drop the irq router compatible string Changes in v2: - Rebase on top of updated SPI flash series Simon Glass (8): dm: x86: Create a driver for x86 interrupts dm: x86: Set up interrupt routing from interrupt_init() dm: x86: Add a common PIRQ init function x86: Use the IRQ device when setting up the mptable x86: Drop the irq router compatible string dm: x86: quark: Add an interrupt driver dm: x86: queensbay: Add an interrupt driver dm: x86: Drop the weak cpu_irq_init() function arch/x86/cpu/baytrail/valleyview.c | 2 +- arch/x86/cpu/interrupts.c | 9 ++++++ arch/x86/cpu/irq.c | 48 ++++++++++++++++------------ arch/x86/cpu/qemu/qemu.c | 5 --- arch/x86/cpu/quark/Makefile | 2 +- arch/x86/cpu/quark/irq.c | 49 ++++++++++++++++++++++++++++ arch/x86/cpu/quark/quark.c | 27 +--------------- arch/x86/cpu/queensbay/Makefile | 2 +- arch/x86/cpu/queensbay/irq.c | 65 ++++++++++++++++++++++++++++++++++++++ arch/x86/cpu/queensbay/tnc.c | 39 +---------------------- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/include/asm/irq.h | 19 ++--------- arch/x86/lib/mpspec.c | 14 ++++---- include/configs/qemu-x86.h | 1 - include/dm/uclass-id.h | 1 + include/fdtdec.h | 1 - lib/fdtdec.c | 1 - 18 files changed, 169 insertions(+), 120 deletions(-) create mode 100644 arch/x86/cpu/quark/irq.c create mode 100644 arch/x86/cpu/queensbay/irq.c -- 2.7.0.rc3.207.g0ac5344

2 21

[U-Boot] [PATCH] powerpc/83xx: fix build failure
by Shengzhou Liu 21 Jan '16

21 Jan '16

Remove duplicated SDRAM_INTERVAL_BSTOPRE from mpc83xx.h, which has been defined in fsl_ddr_sdram.h Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- include/mpc83xx.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/mpc83xx.h b/include/mpc83xx.h index a6d721a..b5a0bbf 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1297,7 +1297,6 @@ */ #define SDRAM_INTERVAL_REFINT 0x3FFF0000 #define SDRAM_INTERVAL_REFINT_SHIFT 16 -#define SDRAM_INTERVAL_BSTOPRE 0x00003FFF #define SDRAM_INTERVAL_BSTOPRE_SHIFT 0 /* -- 2.1.0.27.g96db324

3 6

[U-Boot] [PATCH 1/3] ARMv8/layerscape: Add mmu_init API
by Zhiqiang Hou 21 Jan '16

21 Jan '16

From: Hou Zhiqiang <B48286(a)freescale.com> Expose this API to make it reuseable when u-boot turn into other EL from EL3. Signed-off-by: Hou Zhiqiang <B48286(a)freescale.com> --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 24 ++++++++++++++++++++++++ include/common.h | 1 + 2 files changed, 25 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 6ea28ed..df5670f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -403,6 +403,30 @@ void enable_caches(void) final_mmu_setup(); __asm_invalidate_tlb_all(); } + +static void mmu_disable(void) +{ + if (get_sctlr() & CR_M) + set_sctlr(get_sctlr() & ~CR_M); +} + +static void mmu_enable(void) +{ + if (!(get_sctlr() & CR_M)) + set_sctlr(get_sctlr() | CR_M); +} + +void mmu_init(void) +{ + mmu_disable(); + dcache_disable(); + icache_disable(); + final_mmu_setup(); + __asm_invalidate_tlb_all(); + mmu_enable(); + icache_enable(); + set_sctlr(get_sctlr() | CR_C); +} #endif static inline u32 initiator_type(u32 cluster, int init_id) diff --git a/include/common.h b/include/common.h index 75c78d5..57a9b30 100644 --- a/include/common.h +++ b/include/common.h @@ -757,6 +757,7 @@ void flush_dcache_range(unsigned long start, unsigned long stop); void invalidate_dcache_range(unsigned long start, unsigned long stop); void invalidate_dcache_all(void); void invalidate_icache_all(void); +void mmu_init(void); enum { /* Disable caches (else flush caches but leave them active) */ -- 2.1.0.27.g96db324

4 8

[U-Boot] [PATCH v1 00/16] Add support for 96boards Dragonboard410C board
by Mateusz Kulikowski 21 Jan '16

21 Jan '16

Hi All, I finally managed to cleanup RFC for submission. I've included changes in each patch, there is a bit of them, but all are needed :) This series requires wait_for_bit patch that I send few days ago: https://patchwork.ozlabs.org/patch/561185/ Best Regards, Mateusz Changes in v1: - Added (better) help to KConfig - Added dt binding documentation - Fixed include ordering - Reworked msm_serial_getc - Added error handling to msm_uart_clk_init (that is ignored later for now) - Dropped unneeded DM_FLAG_PRE_RELOC - Added dt binding documentation - Added help to KConfig - Use clrsetbits() to switch direction - Fixed include order - Added #defines for registers/register fields - Added secondary compatible string - Added commit message - Added DT binding documentation - Added Kconfig help - Reordered includes - Dropped redundant fields from msm_sdhc - Cleaned up clock init code (+ added error handling) - Dropped mdelay - use wait_for_bit instead in reset code - Added missing newline after declarations - Added error handling if "reg" is missing - Converted base address to pointer - No changes, just added Acked-by, Reviewed-by - Reordered header files - Removed braces around constant - Added more verbose help to KConfig - Added ULPI dependency to Kconfig - Drop register #defines - use ehci-ci.h instead - Create fixed ulpi viewport for device - Use setbits/clearbits where possible - Use wait_for_bit to reset controller - Add dt binding documents - Reorder includes - Add read/write arguments documentation - add binding documentation and better Kconfig help - Changed a bit mapping - Change include order - Use clrsetbits* where possible - Add one more supported dts id - Handle missing fields in dt properly - Added dt bindings - Reoder includes - Replaced extract_* macros with ordinary shift/mask - Added error checking and whitespaces in probe - Add binding doc - Fixed inlcude ordering - Merged direction_input and direction_output functions - gpio_get: use switch instead of stacked if - use pmic_clrsetbits - add possibility to change prwkey bank name - Handle invalid bindings - Sanity HW check (i.e. check type/subtype registers) - Fix include order - Cleanup defines (added spaces for readibility) - Base address is integer to avoid casting - Use setbits_* family where possible - Drop unneded comments, added newlines where needed - Check return value of dev_get_addr - Add binding for apq8016 - Cleaned up divider calculation - Drop most of gpio.h (only empty file is needed) - Add better help for dragonboard - Move static structures to board_prepare_usb - Add DM_SPMI to defconfig Mateusz Kulikowski (16): serial: Add support for Qualcomm serial port gpio: Add support for Qualcomm gpio controller mmc: Add support for Qualcomm SDHCI controller ehci-hcd: Add init_after_reset usb: ulpi: Add Kconfig options for ULPI usb: Rename ehci-fsl.h to ehci-ci.h usb: ehci-ci: Add missing registers. ehci-ci.h: drop generic USBCMD fields ehci: Add support for Qualcomm EHCI drivers: Add SPMI bus uclass spmi: Add sandbox test driver drivers: spmi: Add support for Qualcomm SPMI bus driver pmic: Add support for Qualcomm PM8916 PMIC gpio: Add support for Qualcomm PM8916 gpios arm: Add support for Qualcomm Snapdragon family board: Add Qualcomm Dragonboard 410C support arch/arm/Kconfig | 12 + arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 2 + arch/arm/dts/dragonboard410c.dts | 154 +++++++++++ arch/arm/mach-snapdragon/Kconfig | 26 ++ arch/arm/mach-snapdragon/Makefile | 8 + arch/arm/mach-snapdragon/clock-apq8016.c | 262 ++++++++++++++++++ arch/arm/mach-snapdragon/include/mach/gpio.h | 9 + .../mach-snapdragon/include/mach/sysmap-apq8016.h | 14 + arch/arm/mach-snapdragon/reset.c | 40 +++ arch/sandbox/dts/sandbox.dts | 20 ++ board/qualcomm/dragonboard410c/Kconfig | 15 + board/qualcomm/dragonboard410c/Makefile | 8 + board/qualcomm/dragonboard410c/dragonboard410c.c | 111 ++++++++ board/qualcomm/dragonboard410c/head.S | 20 ++ board/qualcomm/dragonboard410c/readme.txt | 40 +++ board/qualcomm/dragonboard410c/u-boot.lds | 90 ++++++ configs/dragonboard410c_defconfig | 30 ++ configs/sandbox_defconfig | 4 + doc/device-tree-bindings/gpio/gpio-msm.txt | 22 ++ doc/device-tree-bindings/gpio/pm8916_gpio.txt | 48 ++++ doc/device-tree-bindings/mmc/msm_sdhci.txt | 25 ++ doc/device-tree-bindings/pmic/pm8916.txt | 18 ++ doc/device-tree-bindings/serial/msm-serial.txt | 6 + doc/device-tree-bindings/spmi/spmi-msm.txt | 26 ++ doc/device-tree-bindings/spmi/spmi-sandbox.txt | 34 +++ doc/device-tree-bindings/usb/ehci-msm.txt | 10 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/gpio/Kconfig | 24 ++ drivers/gpio/Makefile | 3 +- drivers/gpio/msm_gpio.c | 129 +++++++++ drivers/gpio/pm8916_gpio.c | 302 +++++++++++++++++++++ drivers/mmc/Kconfig | 9 + drivers/mmc/Makefile | 1 + drivers/mmc/msm_sdhci.c | 180 ++++++++++++ drivers/power/pmic/Kconfig | 14 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pm8916.c | 96 +++++++ drivers/serial/Kconfig | 8 + drivers/serial/Makefile | 1 + drivers/serial/serial_msm.c | 206 ++++++++++++++ drivers/spmi/Kconfig | 23 ++ drivers/spmi/Makefile | 9 + drivers/spmi/spmi-msm.c | 188 +++++++++++++ drivers/spmi/spmi-sandbox.c | 157 +++++++++++ drivers/spmi/spmi-uclass.c | 48 ++++ drivers/usb/Kconfig | 2 + drivers/usb/host/Kconfig | 11 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-hcd.c | 6 + drivers/usb/host/ehci-mpc512x.c | 6 +- drivers/usb/host/ehci-msm.c | 179 ++++++++++++ drivers/usb/host/ehci-mx5.c | 2 +- drivers/usb/host/ehci-mx6.c | 2 +- drivers/usb/host/ehci-mxc.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/ehci-zynq.c | 2 +- drivers/usb/host/ehci.h | 1 + drivers/usb/ulpi/Kconfig | 10 + include/configs/dragonboard410c.h | 182 +++++++++++++ include/dm/uclass-id.h | 1 + include/spmi/spmi.h | 47 ++++ include/usb/{ehci-fsl.h => ehci-ci.h} | 16 +- test/dm/Makefile | 1 + test/dm/spmi.c | 115 ++++++++ 67 files changed, 3029 insertions(+), 18 deletions(-) create mode 100644 arch/arm/dts/dragonboard410c.dts create mode 100644 arch/arm/mach-snapdragon/Kconfig create mode 100644 arch/arm/mach-snapdragon/Makefile create mode 100644 arch/arm/mach-snapdragon/clock-apq8016.c create mode 100644 arch/arm/mach-snapdragon/include/mach/gpio.h create mode 100644 arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h create mode 100644 arch/arm/mach-snapdragon/reset.c create mode 100644 board/qualcomm/dragonboard410c/Kconfig create mode 100644 board/qualcomm/dragonboard410c/Makefile create mode 100644 board/qualcomm/dragonboard410c/dragonboard410c.c create mode 100644 board/qualcomm/dragonboard410c/head.S create mode 100644 board/qualcomm/dragonboard410c/readme.txt create mode 100644 board/qualcomm/dragonboard410c/u-boot.lds create mode 100644 configs/dragonboard410c_defconfig create mode 100644 doc/device-tree-bindings/gpio/gpio-msm.txt create mode 100644 doc/device-tree-bindings/gpio/pm8916_gpio.txt create mode 100644 doc/device-tree-bindings/mmc/msm_sdhci.txt create mode 100644 doc/device-tree-bindings/pmic/pm8916.txt create mode 100644 doc/device-tree-bindings/serial/msm-serial.txt create mode 100644 doc/device-tree-bindings/spmi/spmi-msm.txt create mode 100644 doc/device-tree-bindings/spmi/spmi-sandbox.txt create mode 100644 doc/device-tree-bindings/usb/ehci-msm.txt create mode 100644 drivers/gpio/msm_gpio.c create mode 100644 drivers/gpio/pm8916_gpio.c create mode 100644 drivers/mmc/msm_sdhci.c create mode 100644 drivers/power/pmic/pm8916.c create mode 100644 drivers/serial/serial_msm.c create mode 100644 drivers/spmi/Kconfig create mode 100644 drivers/spmi/Makefile create mode 100644 drivers/spmi/spmi-msm.c create mode 100644 drivers/spmi/spmi-sandbox.c create mode 100644 drivers/spmi/spmi-uclass.c create mode 100644 drivers/usb/host/ehci-msm.c create mode 100644 drivers/usb/ulpi/Kconfig create mode 100644 include/configs/dragonboard410c.h create mode 100644 include/spmi/spmi.h rename include/usb/{ehci-fsl.h => ehci-ci.h} (96%) create mode 100644 test/dm/spmi.c -- 2.5.0

5 48

[U-Boot] [PATCH] board/t4240rdb: VID support
by ying.zhang＠freescale.com 20 Jan '16

20 Jan '16

From: Ying Zhang <b40530(a)freescale.com> The fuse status register provides the values from on-chip voltage ID efuses programmed at the factory. These values define the voltage requirements for the chip. u-boot reads FUSESR and translates the values into the appropriate commands to set the voltage output value of an external voltage regulator. Signed-off-by: Ying Zhang <b40530(a)freescale.com> --- board/freescale/common/vid.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 7 +++++++ include/configs/T4240RDB.h | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index f1bed51..571e105 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -42,7 +42,7 @@ int __weak board_vdd_drop_compensation(void) * The IR chip can show up under the following addresses: * 0x08 (Verified on T1040RDB-PA,T4240RDB-PB,X-T4240RDB-16GPA) * 0x09 (Verified on T1040RDB-PA) - * 0x38 (Verified on T2080QDS, T2081QDS) + * 0x38 (Verified on T2080QDS, T2081QDS, T4240RDB) */ static int find_ir_chip_on_i2c(void) { diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index fac442b..99a8730 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -21,6 +21,7 @@ #include "t4rdb.h" #include "cpld.h" +#include "../common/vid.h" DECLARE_GLOBAL_DATA_PTR; @@ -79,6 +80,12 @@ int board_early_init_r(void) #ifdef CONFIG_SYS_DPAA_QBMAN setup_portals(); #endif + /* + * Adjust core voltage according to voltage ID + * This function changes I2C mux to channel 2. + */ + if (adjust_vdd(0)) + printf("Warning: Adjusting core voltage failed.\n"); return 0; } diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 73279c8..4a17f41 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -606,6 +606,16 @@ unsigned long get_board_ddr_clk(void); #define I2C_VOL_MONITOR_BUS_V_OVF 0x1 #define I2C_VOL_MONITOR_BUS_V_SHIFT 3 +#define CONFIG_VID_FLS_ENV "t4240rdb_vdd_mv" +#ifndef CONFIG_SPL_BUILD +#define CONFIG_VID +#endif +#define CONFIG_VOL_MONITOR_IR36021_SET +#define CONFIG_VOL_MONITOR_IR36021_READ +/* The lowest and highest voltage allowed for T4240RDB */ +#define VDD_MV_MIN 819 +#define VDD_MV_MAX 1212 + /* * eSPI - Enhanced SPI */ -- 1.8.4.1

2 1

[U-Boot] [PATCH] iocon / bamboo: Drop CONFIG_SYS_LONGHELP
by Tom Rini 20 Jan '16

20 Jan '16

The iocon and bamboo boards are often on the verge of, or going over, their allowed size limits depending on toolchain used. If we turn off CONFIG_SYS_LONGHELP we can gain approximately 14KiB back. Cc: Dirk Eibach <eibach(a)gdsys.de> Cc: Stefan Roese <sr(a)denx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- include/configs/bamboo.h | 3 +++ include/configs/iocon.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 5b8b22f..bb2abf1 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -29,6 +29,9 @@ #define CONFIG_HOSTNAME bamboo #include "amcc-common.h" +/* Reclaim some space. */ +#undef CONFIG_SYS_LONGHELP + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ /* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 8663c17..8bc89a0 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -20,6 +20,9 @@ #define CONFIG_IDENT_STRING " iocon 0.06" #include "amcc-common.h" +/* Reclaim some space. */ +#undef CONFIG_SYS_LONGHELP + #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT -- 1.7.9.5

3 3

[U-Boot] [PATCH] stm32: move stm32 specific code to mach-stm32
by Vikas Manocha 20 Jan '16

20 Jan '16

This patch moves stm32 sources at one place, with this armv7m now contains only generic stuff. Signed-off-by: Vikas Manocha <vikas.manocha(a)st.com> --- arch/arm/Kconfig | 7 ++++--- arch/arm/Makefile | 1 + arch/arm/cpu/armv7m/Makefile | 3 --- arch/arm/mach-stm32/Kconfig | 12 ++++++++++++ arch/arm/{cpu/armv7m => mach-stm32}/Makefile | 3 --- arch/arm/mach-stm32/stm32f1/Kconfig | 3 +++ arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/Makefile | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/clock.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/flash.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/soc.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/timer.c | 0 arch/arm/mach-stm32/stm32f4/Kconfig | 8 ++++++++ arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/Makefile | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/clock.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/flash.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/soc.c | 0 arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/timer.c | 0 configs/stm32f429-discovery_defconfig | 2 ++ include/configs/stm32f429-discovery.h | 1 - 19 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 arch/arm/mach-stm32/Kconfig copy arch/arm/{cpu/armv7m => mach-stm32}/Makefile (84%) create mode 100644 arch/arm/mach-stm32/stm32f1/Kconfig rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/Makefile (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/clock.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/flash.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/soc.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f1/timer.c (100%) create mode 100644 arch/arm/mach-stm32/stm32f4/Kconfig rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/Makefile (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/clock.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/flash.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/soc.c (100%) rename arch/arm/{cpu/armv7m => mach-stm32}/stm32f4/timer.c (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9bd6cf1..90b61ae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -695,8 +695,8 @@ config ARCH_UNIPHIER Support for UniPhier SoC family developed by Socionext Inc. (formerly, System LSI Business Division of Panasonic Corporation) -config TARGET_STM32F429_DISCOVERY - bool "Support STM32F429 Discovery" +config STM32 + bool "Support STM32" select CPU_V7M select DM select DM_SERIAL @@ -751,6 +751,8 @@ source "arch/arm/mach-s5pc1xx/Kconfig" source "arch/arm/mach-socfpga/Kconfig" +source "arch/arm/mach-stm32/Kconfig" + source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-uniphier/Kconfig" @@ -827,7 +829,6 @@ source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" -source "board/st/stm32f429-discovery/Kconfig" source "board/st/stv0991/Kconfig" source "board/sunxi/Kconfig" source "board/syteco/zmx25/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 18283d1..80a5410 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -56,6 +56,7 @@ machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip +machine-$(CONFIG_STM32) += stm32 machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_ZYNQ) += zynq diff --git a/arch/arm/cpu/armv7m/Makefile b/arch/arm/cpu/armv7m/Makefile index 93a1956..aff60e8 100644 --- a/arch/arm/cpu/armv7m/Makefile +++ b/arch/arm/cpu/armv7m/Makefile @@ -7,6 +7,3 @@ extra-y := start.o obj-y += cpu.o - -obj-$(CONFIG_STM32F1) += stm32f1/ -obj-$(CONFIG_STM32F4) += stm32f4/ diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig new file mode 100644 index 0000000..7dbeb04 --- /dev/null +++ b/arch/arm/mach-stm32/Kconfig @@ -0,0 +1,12 @@ +if STM32 + +config STM32F4 + bool "stm32f4 family" + +config STM32F1 + bool "stm32f1 family" + +source "arch/arm/mach-stm32/stm32f4/Kconfig" +source "arch/arm/mach-stm32/stm32f1/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7m/Makefile b/arch/arm/mach-stm32/Makefile similarity index 84% copy from arch/arm/cpu/armv7m/Makefile copy to arch/arm/mach-stm32/Makefile index 93a1956..ea06034 100644 --- a/arch/arm/cpu/armv7m/Makefile +++ b/arch/arm/mach-stm32/Makefile @@ -5,8 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -extra-y := start.o -obj-y += cpu.o - obj-$(CONFIG_STM32F1) += stm32f1/ obj-$(CONFIG_STM32F4) += stm32f4/ diff --git a/arch/arm/mach-stm32/stm32f1/Kconfig b/arch/arm/mach-stm32/stm32f1/Kconfig new file mode 100644 index 0000000..f627fd2 --- /dev/null +++ b/arch/arm/mach-stm32/stm32f1/Kconfig @@ -0,0 +1,3 @@ +if STM32F1 + +endif diff --git a/arch/arm/cpu/armv7m/stm32f1/Makefile b/arch/arm/mach-stm32/stm32f1/Makefile similarity index 100% rename from arch/arm/cpu/armv7m/stm32f1/Makefile rename to arch/arm/mach-stm32/stm32f1/Makefile diff --git a/arch/arm/cpu/armv7m/stm32f1/clock.c b/arch/arm/mach-stm32/stm32f1/clock.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f1/clock.c rename to arch/arm/mach-stm32/stm32f1/clock.c diff --git a/arch/arm/cpu/armv7m/stm32f1/flash.c b/arch/arm/mach-stm32/stm32f1/flash.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f1/flash.c rename to arch/arm/mach-stm32/stm32f1/flash.c diff --git a/arch/arm/cpu/armv7m/stm32f1/soc.c b/arch/arm/mach-stm32/stm32f1/soc.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f1/soc.c rename to arch/arm/mach-stm32/stm32f1/soc.c diff --git a/arch/arm/cpu/armv7m/stm32f1/timer.c b/arch/arm/mach-stm32/stm32f1/timer.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f1/timer.c rename to arch/arm/mach-stm32/stm32f1/timer.c diff --git a/arch/arm/mach-stm32/stm32f4/Kconfig b/arch/arm/mach-stm32/stm32f4/Kconfig new file mode 100644 index 0000000..a63619e --- /dev/null +++ b/arch/arm/mach-stm32/stm32f4/Kconfig @@ -0,0 +1,8 @@ +if STM32F4 + +config TARGET_STM32F429_DISCOVERY + bool "STM32F429 Discovery board" + +source "board/st/stm32f429-discovery/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7m/stm32f4/Makefile b/arch/arm/mach-stm32/stm32f4/Makefile similarity index 100% rename from arch/arm/cpu/armv7m/stm32f4/Makefile rename to arch/arm/mach-stm32/stm32f4/Makefile diff --git a/arch/arm/cpu/armv7m/stm32f4/clock.c b/arch/arm/mach-stm32/stm32f4/clock.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f4/clock.c rename to arch/arm/mach-stm32/stm32f4/clock.c diff --git a/arch/arm/cpu/armv7m/stm32f4/flash.c b/arch/arm/mach-stm32/stm32f4/flash.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f4/flash.c rename to arch/arm/mach-stm32/stm32f4/flash.c diff --git a/arch/arm/cpu/armv7m/stm32f4/soc.c b/arch/arm/mach-stm32/stm32f4/soc.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f4/soc.c rename to arch/arm/mach-stm32/stm32f4/soc.c diff --git a/arch/arm/cpu/armv7m/stm32f4/timer.c b/arch/arm/mach-stm32/stm32f4/timer.c similarity index 100% rename from arch/arm/cpu/armv7m/stm32f4/timer.c rename to arch/arm/mach-stm32/stm32f4/timer.c diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index 7512457..fb330e2 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -1,4 +1,6 @@ CONFIG_ARM=y +CONFIG_STM32=y +CONFIG_STM32F4=y CONFIG_TARGET_STM32F429_DISCOVERY=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_SETEXPR is not set diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 3e80861..85d492d 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -8,7 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_STM32F4 #define CONFIG_SYS_THUMB_BUILD #define CONFIG_STM32F4DISCOVERY -- 1.9.1

2 1