diff options
| author | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 13:51:00 (GMT) |
|---|---|---|
| committer | vojo <joris.van.vossen@sintecs.nl> | 2017-08-23 13:51:00 (GMT) |
| commit | 0d48297646c426cdd206b0e530495ab7eb02acd3 (patch) | |
| tree | 003db115fb07d125bade819a49da8b05b146d38b /arch | |
| parent | dd543f16bbaeb86c8131d2532791dcc2748c6e5f (diff) | |
| download | u-boot-fsl-qoriq-0d48297646c426cdd206b0e530495ab7eb02acd3.tar.xz | |
Upstream u-boot update and added QT1040-1GB device support
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 53 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 8 |
2 files changed, 50 insertions, 11 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 0f01db0..b770a6a 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -400,12 +400,57 @@ config TARGET_CYRUS_P5040 select ARCH_P5040 select PHYS_64BIT -config TARGET_SIMC_T10XX - bool "Support simc-t10xx" +config TARGET_SIMC_TXXXX + bool "Support simc-txxxx" + select BOARD_LATE_INIT if CHAIN_OF_TRUST + select PHYS_64BIT + select SUPPORT_SPL + +config TARGET_QT1040_1GB + bool "Support QT1040-1GB" + select ARCH_T1040 + select BOARD_LATE_INIT if CHAIN_OF_TRUST + select PHYS_64BIT select SUPPORT_SPL - endchoice +choice + depends on TARGET_SIMC_TXXXX || TARGET_QT1040_1GB + prompt "CPU type" + optional + help + Select the exact type of CPU which is used on the version of the simc-txxxx module + +config PPC_T1020 + bool + prompt "T1020" + depends on TARGET_SIMC_TXXXX + select ARCH_T1020 + +config PPC_T1022 + bool + prompt "T1022" + depends on TARGET_SIMC_TXXXX + select ARCH_T1022 + +config PPC_T1040 + bool + prompt "T1040" + select ARCH_T1040 + +config PPC_T1042 + bool + prompt "T1042" + depends on TARGET_SIMC_TXXXX + select ARCH_T1042 + +#config PPC_T2081 +# bool +# prompt "T2081" +# depends on TARGET_SIMC_TXXXX +# select ARCH_T2081 +endchoice + config ARCH_B4420 bool select E500MC @@ -1526,7 +1571,9 @@ source "board/freescale/t4rdb/Kconfig" source "board/gdsys/p1022/Kconfig" source "board/keymile/kmp204x/Kconfig" source "board/sbc8548/Kconfig" +source "board/scalys/common/Kconfig" source "board/scalys/simc-t10xx/Kconfig" +source "board/scalys/simc-t2081/Kconfig" source "board/socrates/Kconfig" source "board/varisys/cyrus/Kconfig" source "board/xes/xpedite520x/Kconfig" diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h index 0c72c71..76faa22 100644 --- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h @@ -14,7 +14,6 @@ #ifndef __ASM_ARCH_MX85XX_GPIO_H #define __ASM_ARCH_MX85XX_GPIO_H -<<<<<<< bc5d0384458466ed5b3608d326eec03cd4f13016 #ifndef CONFIG_MPC85XX_GPIO #include <asm/mpc85xx_gpio.h> #endif @@ -24,12 +23,5 @@ struct mpc85xx_gpio_plat { unsigned long size; uint ngpios; }; -======= -#ifdef CONFIG_MPC8XXX_GPIO -#include <asm/mpc8xxx_gpio.h> -#else -#include <asm/mpc85xx_gpio.h> -#endif ->>>>>>> dm: gpio: Add DM GPIO driver for MPC8xxx platforms #endif |