diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cac9143f214db3451e4f690d97571206cabf3320..c81307a8be0046387041197d2632b8b2e2aad777 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -671,56 +671,9 @@ config TARGET_VF610TWR config ZYNQ bool "Xilinx Zynq Platform" -config TARGET_MEDCOM_WIDE - bool "Support medcom-wide" - -config TARGET_PLUTUX - bool "Support plutux" - -config TARGET_TEC - bool "Support tec" - -config TARGET_PAZ00 - bool "Support paz00" - -config TARGET_TRIMSLICE - bool "Support trimslice" - -config TARGET_HARMONY - bool "Support harmony" - -config TARGET_SEABOARD - bool "Support seaboard" - -config TARGET_VENTANA - bool "Support ventana" - -config TARGET_WHISTLER - bool "Support whistler" - -config TARGET_COLIBRI_T20_IRIS - bool "Support colibri_t20_iris" - -config TARGET_COLIBRI_T30 - bool "Support Colibri T30" - -config TARGET_TEC_NG - bool "Support tec-ng" - -config TARGET_BEAVER - bool "Support beaver" - -config TARGET_CARDHU - bool "Support cardhu" - -config TARGET_DALMORE - bool "Support dalmore" - -config TARGET_JETSON_TK1 - bool "Support jetson-tk1" - -config TARGET_VENICE2 - bool "Support venice2" +config TEGRA + bool "NVIDIA Tegra" + select SPL config TARGET_VEXPRESS_AEMV8A bool "Support vexpress_aemv8a" @@ -775,7 +728,10 @@ config TARGET_JORNADA endchoice +source "arch/arm/cpu/armv7/tegra-common/Kconfig" + source "arch/arm/cpu/armv7/zynq/Kconfig" + source "board/8dtech/eco5pk/Kconfig" source "board/aristainetos/Kconfig" source "board/Barix/ipam390/Kconfig" @@ -818,10 +774,6 @@ source "board/atmel/at91sam9rlek/Kconfig" source "board/atmel/at91sam9x5ek/Kconfig" source "board/atmel/sama5d3_xplained/Kconfig" source "board/atmel/sama5d3xek/Kconfig" -source "board/avionic-design/medcom-wide/Kconfig" -source "board/avionic-design/plutux/Kconfig" -source "board/avionic-design/tec-ng/Kconfig" -source "board/avionic-design/tec/Kconfig" source "board/balloon3/Kconfig" source "board/barco/titanium/Kconfig" source "board/bluegiga/apx4devkit/Kconfig" @@ -839,11 +791,9 @@ source "board/cloudengines/pogo_e02/Kconfig" source "board/cm4008/Kconfig" source "board/cm41xx/Kconfig" source "board/comelit/dig297/Kconfig" -source "board/compal/paz00/Kconfig" source "board/compulab/cm_t335/Kconfig" source "board/compulab/cm_t35/Kconfig" source "board/compulab/cm_t54/Kconfig" -source "board/compulab/trimslice/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" source "board/corscience/tricorder/Kconfig" source "board/creative/xfi3/Kconfig" @@ -915,15 +865,6 @@ source "board/logicpd/zoom1/Kconfig" source "board/matrix_vision/mvblx/Kconfig" source "board/mpl/vcma9/Kconfig" source "board/nokia/rx51/Kconfig" -source "board/nvidia/beaver/Kconfig" -source "board/nvidia/cardhu/Kconfig" -source "board/nvidia/dalmore/Kconfig" -source "board/nvidia/harmony/Kconfig" -source "board/nvidia/jetson-tk1/Kconfig" -source "board/nvidia/seaboard/Kconfig" -source "board/nvidia/venice2/Kconfig" -source "board/nvidia/ventana/Kconfig" -source "board/nvidia/whistler/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" source "board/omicron/calimain/Kconfig" source "board/overo/Kconfig" @@ -995,8 +936,6 @@ source "board/ti/tnetv107xevm/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/timll/devkit8000/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" -source "board/toradex/colibri_t20_iris/Kconfig" -source "board/toradex/colibri_t30/Kconfig" source "board/trizepsiv/Kconfig" source "board/ttcontrol/vision2/Kconfig" source "board/udoo/Kconfig" diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..8e2153bb83f64a09e33bac02039fa5a9a54d0f2a --- /dev/null +++ b/arch/arm/cpu/armv7/tegra-common/Kconfig @@ -0,0 +1,30 @@ +if TEGRA + +choice + prompt "Tegra SoC select" + +config TEGRA20 + bool "Tegra20 family" + +config TEGRA30 + bool "Tegra30 family" + +config TEGRA114 + bool "Tegra114 family" + +config TEGRA124 + bool "Tegra124 family" + +endchoice + +config SYS_CPU + string + default "arm720t" if SPL_BUILD + default "armv7" if !SPL_BUILD + +source "arch/arm/cpu/armv7/tegra20/Kconfig" +source "arch/arm/cpu/armv7/tegra30/Kconfig" +source "arch/arm/cpu/armv7/tegra114/Kconfig" +source "arch/arm/cpu/armv7/tegra124/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/cpu/armv7/tegra114/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..33a22da53512292955878c4298040055728f9eb8 --- /dev/null +++ b/arch/arm/cpu/armv7/tegra114/Kconfig @@ -0,0 +1,17 @@ +if TEGRA114 + +choice + prompt "Tegra114 board select" + +config TARGET_DALMORE + bool "NVIDIA Tegra114 Dalmore evaluation board" + +endchoice + +config SYS_SOC + string + default "tegra114" + +source "board/nvidia/dalmore/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/cpu/armv7/tegra124/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..753f511eda2aed6443af2e02611aae6d2cd0f351 --- /dev/null +++ b/arch/arm/cpu/armv7/tegra124/Kconfig @@ -0,0 +1,21 @@ +if TEGRA124 + +choice + prompt "Tegra124 board select" + +config TARGET_JETSON_TK1 + bool "NVIDIA Tegra124 Jetson TK1 board" + +config TARGET_VENICE2 + bool "NVIDIA Tegra124 Venice2" + +endchoice + +config SYS_SOC + string + default "tegra124" + +source "board/nvidia/jetson-tk1/Kconfig" +source "board/nvidia/venice2/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/cpu/armv7/tegra20/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..e2e08900b9a9cb032d64c3e7ecfc833f8ba2b883 --- /dev/null +++ b/arch/arm/cpu/armv7/tegra20/Kconfig @@ -0,0 +1,53 @@ +if TEGRA20 + +choice + prompt "Tegra20 board select" + +config TARGET_HARMONY + bool "NVIDIA Tegra20 Harmony evaluation board" + +config TARGET_MEDCOM_WIDE + bool "Avionic Design Medcom-Wide board" + +config TARGET_PAZ00 + bool "Paz00 board" + +config TARGET_PLUTUX + bool "Avionic Design Plutux board" + +config TARGET_SEABOARD + bool "NVIDIA Seaboard" + +config TARGET_TEC + bool "Avionic Design Tamonten Evaluation Carrier" + +config TARGET_TRIMSLICE + bool "Compulab TrimSlice board" + +config TARGET_VENTANA + bool "NVIDIA Tegra20 Ventana evaluation board" + +config TARGET_WHISTLER + bool "NVIDIA Tegra20 Whistler evaluation board" + +config TARGET_COLIBRI_T20_IRIS + bool "Toradex Colibri T20 board" + +endchoice + +config SYS_SOC + string + default "tegra20" + +source "board/nvidia/harmony/Kconfig" +source "board/avionic-design/medcom-wide/Kconfig" +source "board/compal/paz00/Kconfig" +source "board/avionic-design/plutux/Kconfig" +source "board/nvidia/seaboard/Kconfig" +source "board/avionic-design/tec/Kconfig" +source "board/compulab/trimslice/Kconfig" +source "board/nvidia/ventana/Kconfig" +source "board/nvidia/whistler/Kconfig" +source "board/toradex/colibri_t20_iris/Kconfig" + +endif diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/cpu/armv7/tegra30/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..694e1cd974fce123fb5756ffb12fb35d327fc9ed --- /dev/null +++ b/arch/arm/cpu/armv7/tegra30/Kconfig @@ -0,0 +1,29 @@ +if TEGRA30 + +choice + prompt "Tegra30 board select" + +config TARGET_BEAVER + bool "NVIDIA Tegra30 Beaver evaluation board" + +config TARGET_CARDHU + bool "NVIDIA Tegra30 Cardhu evaluation board" + +config TARGET_COLIBRI_T30 + bool "Toradex Colibri T30 board" + +config TARGET_TEC_NG + bool "Avionic Design TEC-NG board" + +endchoice + +config SYS_SOC + string + default "tegra30" + +source "board/nvidia/beaver/Kconfig" +source "board/nvidia/cardhu/Kconfig" +source "board/toradex/colibri_t30/Kconfig" +source "board/avionic-design/tec-ng/Kconfig" + +endif diff --git a/arch/arm/include/asm/arch-tegra114/tegra.h b/arch/arm/include/asm/arch-tegra114/tegra.h index 705ca5758e2b7ee15ced47d6ce77e7dd3bb2a786..5d426b524a1e10776e73940e16c0be70596a6e2a 100644 --- a/arch/arm/include/asm/arch-tegra114/tegra.h +++ b/arch/arm/include/asm/arch-tegra114/tegra.h @@ -17,8 +17,6 @@ #ifndef _TEGRA114_H_ #define _TEGRA114_H_ -#define CONFIG_TEGRA114 - #define NV_PA_SDRAM_BASE 0x80000000 /* 0x80000000 for real T114 */ #define NV_PA_TSC_BASE 0x700F0000 /* System Counter TSC regs */ diff --git a/arch/arm/include/asm/arch-tegra124/tegra.h b/arch/arm/include/asm/arch-tegra124/tegra.h index 86ebd19453ef314733789a00b11137b2a447b384..db3d8379203b254422f9b8f253708ec19ebffa92 100644 --- a/arch/arm/include/asm/arch-tegra124/tegra.h +++ b/arch/arm/include/asm/arch-tegra124/tegra.h @@ -8,8 +8,6 @@ #ifndef _TEGRA124_H_ #define _TEGRA124_H_ -#define CONFIG_TEGRA124 - #define NV_PA_SDRAM_BASE 0x80000000 #define NV_PA_TSC_BASE 0x700F0000 /* System Counter TSC regs */ #define NV_PA_MC_BASE 0x70019000 /* Mem Ctlr regs (MCB, etc.) */ diff --git a/arch/arm/include/asm/arch-tegra20/tegra.h b/arch/arm/include/asm/arch-tegra20/tegra.h index 6a4b40ec7608a906e21983f4f34d48275922e795..18856ac3727d085977a9b5b1b70f9963f33548f4 100644 --- a/arch/arm/include/asm/arch-tegra20/tegra.h +++ b/arch/arm/include/asm/arch-tegra20/tegra.h @@ -8,8 +8,6 @@ #ifndef _TEGRA20_H_ #define _TEGRA20_H_ -#define CONFIG_TEGRA20 - #define NV_PA_SDRAM_BASE 0x00000000 #include diff --git a/arch/arm/include/asm/arch-tegra30/tegra.h b/arch/arm/include/asm/arch-tegra30/tegra.h index 4ad8b1c05346abe70be867c61b88b364a7c15ff3..c02c5d850037ffb7460b7df3b17f41cbf5c932ca 100644 --- a/arch/arm/include/asm/arch-tegra30/tegra.h +++ b/arch/arm/include/asm/arch-tegra30/tegra.h @@ -17,8 +17,6 @@ #ifndef _TEGRA30_H_ #define _TEGRA30_H_ -#define CONFIG_TEGRA30 - #define NV_PA_SDRAM_BASE 0x80000000 /* 0x80000000 for real T30 */ #include diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig index 2472fe2a4ef01c049765c99f2624693d89cbe641..16001e4b07c94b73ab0511fadbba6a5b5fd9ea79 100644 --- a/board/avionic-design/medcom-wide/Kconfig +++ b/board/avionic-design/medcom-wide/Kconfig @@ -1,10 +1,5 @@ if TARGET_MEDCOM_WIDE -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "medcom-wide" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "avionic-design" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "medcom-wide" diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig index a697a54477044374a79a742309709d9f83bd0bba..c9a90247a2a511bf03eada3643414a26f4ba12d9 100644 --- a/board/avionic-design/plutux/Kconfig +++ b/board/avionic-design/plutux/Kconfig @@ -1,10 +1,5 @@ if TARGET_PLUTUX -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "plutux" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "avionic-design" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "plutux" diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig index f52eddae762d9a37585358b417486f9a6a175838..e6b69e84306704e709ddf03d13453ec91e563d51 100644 --- a/board/avionic-design/tec-ng/Kconfig +++ b/board/avionic-design/tec-ng/Kconfig @@ -1,10 +1,5 @@ if TARGET_TEC_NG -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "tec-ng" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "avionic-design" -config SYS_SOC - string - default "tegra30" - config SYS_CONFIG_NAME string default "tec-ng" diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig index d19e3f43c7bef9bae269419d442c89b69d0a741b..fbf7f469762a8632c6b5e0e07204230eecfd2222 100644 --- a/board/avionic-design/tec/Kconfig +++ b/board/avionic-design/tec/Kconfig @@ -1,10 +1,5 @@ if TARGET_TEC -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "tec" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "avionic-design" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "tec" diff --git a/board/compal/paz00/Kconfig b/board/compal/paz00/Kconfig index 4f0f09fd7e840f136b3b474b2e6fcdb5675be42f..690d7a77826c7003100c6ba0dae8547430a54bb5 100644 --- a/board/compal/paz00/Kconfig +++ b/board/compal/paz00/Kconfig @@ -1,10 +1,5 @@ if TARGET_PAZ00 -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "paz00" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "compal" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "paz00" diff --git a/board/compulab/trimslice/Kconfig b/board/compulab/trimslice/Kconfig index e545f0cba1ed49528c511a047963cda0aa31b082..6ae030c737d36ff9b1585f6b149699513aab7c5f 100644 --- a/board/compulab/trimslice/Kconfig +++ b/board/compulab/trimslice/Kconfig @@ -1,10 +1,5 @@ if TARGET_TRIMSLICE -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "trimslice" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "compulab" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "trimslice" diff --git a/board/nvidia/beaver/Kconfig b/board/nvidia/beaver/Kconfig index f05267611f7adc6861b7da725afc34a928aac6bc..e487b66f13234a13d980b1895ec0bb39ea7834b7 100644 --- a/board/nvidia/beaver/Kconfig +++ b/board/nvidia/beaver/Kconfig @@ -1,10 +1,5 @@ if TARGET_BEAVER -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "beaver" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra30" - config SYS_CONFIG_NAME string default "beaver" diff --git a/board/nvidia/cardhu/Kconfig b/board/nvidia/cardhu/Kconfig index 9853114dbaa96f852b6ff676b08e7664864a9243..150815f7a603e43f211782340ad1a9aa01bfe0b0 100644 --- a/board/nvidia/cardhu/Kconfig +++ b/board/nvidia/cardhu/Kconfig @@ -1,10 +1,5 @@ if TARGET_CARDHU -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "cardhu" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra30" - config SYS_CONFIG_NAME string default "cardhu" diff --git a/board/nvidia/dalmore/Kconfig b/board/nvidia/dalmore/Kconfig index 33b78dbf10646f1578fdccc2985c8e1c65a86545..9eed19c35306c8f01315a5c9910a201d7efc725a 100644 --- a/board/nvidia/dalmore/Kconfig +++ b/board/nvidia/dalmore/Kconfig @@ -1,10 +1,5 @@ if TARGET_DALMORE -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "dalmore" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra114" - config SYS_CONFIG_NAME string default "dalmore" diff --git a/board/nvidia/harmony/Kconfig b/board/nvidia/harmony/Kconfig index 2a3bde402962b280cf8c5023f8b4baa3fe3f672c..7d75f2d271230825e11b914df71e42d62c187d83 100644 --- a/board/nvidia/harmony/Kconfig +++ b/board/nvidia/harmony/Kconfig @@ -1,10 +1,5 @@ if TARGET_HARMONY -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "harmony" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "harmony" diff --git a/board/nvidia/jetson-tk1/Kconfig b/board/nvidia/jetson-tk1/Kconfig index 22b4c6923559d95c738f72a49d009525a9d8147b..02b46b7a867d936bc1bbaa8114fa74de1c466cd9 100644 --- a/board/nvidia/jetson-tk1/Kconfig +++ b/board/nvidia/jetson-tk1/Kconfig @@ -1,10 +1,5 @@ if TARGET_JETSON_TK1 -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "jetson-tk1" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra124" - config SYS_CONFIG_NAME string default "jetson-tk1" diff --git a/board/nvidia/seaboard/Kconfig b/board/nvidia/seaboard/Kconfig index 39c65b5d381d702e08c35ce3a596c128816849c7..786370226e0fd8ce39117421320a167fc36ae9d1 100644 --- a/board/nvidia/seaboard/Kconfig +++ b/board/nvidia/seaboard/Kconfig @@ -1,10 +1,5 @@ if TARGET_SEABOARD -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "seaboard" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "seaboard" diff --git a/board/nvidia/venice2/Kconfig b/board/nvidia/venice2/Kconfig index 84a7160ab69d557b3226e8a420efc34c1a11246b..993da79d6e5b31481c5f68316b0ee7793d0d9f10 100644 --- a/board/nvidia/venice2/Kconfig +++ b/board/nvidia/venice2/Kconfig @@ -1,10 +1,5 @@ if TARGET_VENICE2 -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "venice2" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra124" - config SYS_CONFIG_NAME string default "venice2" diff --git a/board/nvidia/ventana/Kconfig b/board/nvidia/ventana/Kconfig index 59e85c490fe005766278e9ba100f0d73484601dd..95840a8f061460bacfa393cd69e354401e7f7626 100644 --- a/board/nvidia/ventana/Kconfig +++ b/board/nvidia/ventana/Kconfig @@ -1,10 +1,5 @@ if TARGET_VENTANA -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "ventana" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "ventana" diff --git a/board/nvidia/whistler/Kconfig b/board/nvidia/whistler/Kconfig index f025413c2784eddc13ac6caf0fe19f9466a225db..113e2ef70e4d65ecf4d187ce740ea800d36c97bc 100644 --- a/board/nvidia/whistler/Kconfig +++ b/board/nvidia/whistler/Kconfig @@ -1,10 +1,5 @@ if TARGET_WHISTLER -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "whistler" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "nvidia" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "whistler" diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20_iris/Kconfig index 334b7e051fdfee7888eae2dfcaeedbaf7e8ece18..cccdd584c8b6c926d2eaf992115eab6220122f28 100644 --- a/board/toradex/colibri_t20_iris/Kconfig +++ b/board/toradex/colibri_t20_iris/Kconfig @@ -1,10 +1,5 @@ if TARGET_COLIBRI_T20_IRIS -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "colibri_t20_iris" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "toradex" -config SYS_SOC - string - default "tegra20" - config SYS_CONFIG_NAME string default "colibri_t20_iris" diff --git a/board/toradex/colibri_t30/Kconfig b/board/toradex/colibri_t30/Kconfig index fcf5e8ef9708c44423f1fdf4aa358b5030e0b8f5..ea6c08a59cc52de0b0541c7527d35d9b566ff613 100644 --- a/board/toradex/colibri_t30/Kconfig +++ b/board/toradex/colibri_t30/Kconfig @@ -1,10 +1,5 @@ if TARGET_COLIBRI_T30 -config SYS_CPU - string - default "arm720t" if SPL_BUILD - default "armv7" if !SPL_BUILD - config SYS_BOARD string default "colibri_t30" @@ -13,10 +8,6 @@ config SYS_VENDOR string default "toradex" -config SYS_SOC - string - default "tegra30" - config SYS_CONFIG_NAME string default "colibri_t30" diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 0e70f25d8a1d2f5fd0b6cf69de98d2cf1e759b48..7c9d94bbccf1768bd707757f4eed7eab9fe82b8a 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_BEAVER=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 564ad5a5450a3a7a0767e88d034b39c4a96f47c8..bb042b4648602a778f12930112eec95d4a4e298c 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_CARDHU=y diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig index 8ff246428bcbf8b90b44c284dd08bf84e307e3a5..b2a21e186ad57cba4813f15f5cec3838398cd038 100644 --- a/configs/colibri_t20_iris_defconfig +++ b/configs/colibri_t20_iris_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 32f1d6493fb0333e8bd79e473788eba13ee45bda..abb41f3f2286478c77aafbdff1d5afbd7b529c22 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_COLIBRI_T30=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 288b2381ef590abb64f170e674479930b8c0a3e8..70677aac4129c001def988cbbadebc134b38b239 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA114=y +S:CONFIG_TARGET_DALMORE=y diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index d25ea5cb19203fe1c1d5e9dc815908f8259c6697..a52231b6557554dd8076e1ce5e977b5db293515b 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_HARMONY=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 6926257d894b736bc4bc3d56a1ad24b845b8c0f2..00eac92319e0c20ac6df65f1dbd1b2e3ce77517e 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_JETSON_TK1=y diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index ddf3437358c3feba4e17b47c6a40d70bc3b95799..e9a39309104d5533bee6f70ee1550ace4fcb9c33 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_MEDCOM_WIDE=y diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index 61a536e73487915b3b3ff029467bce3fa9f50e29..05974eb10c8805601b4f1cfc84423dfc3b429a55 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PAZ00=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 672b66c8a59b0f6788453a75167d984cc233967c..60e80ffa610b455f4259717145ec78906bbb7d86 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PLUTUX=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index c0f078bbdcbb92afeb0ebca4749e402a314be803..516e760dfaae1ab0b7853a08824645bcca8af48b 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_SEABOARD=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 2360d25d2cd6e2631dda10adff78a19950786785..e4a31cc05423a69570814a9442bb1e2d344962a1 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_TEC_NG=y diff --git a/configs/tec_defconfig b/configs/tec_defconfig index 1aaa9d183f3a2c87f984c304c965ae9c00cc7f76..62a9542d94c584d5e1711d918a781b1fef1dce93 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TEC=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index c096c65a88fe0e391aa539e76ee404c7711fc533..94f23e3ea4d98ad0142f6610b716744c7baeb3c8 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TRIMSLICE=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 2bfa91db6e9710691796c5309e92780c35b25fe0..dfc54078ed29af0ffee62786d19dcb3d54df3531 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_VENICE2=y diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 75fca961ca73d15b9998017445de2d97124306e2..845e24173c0c53e1f82641d375cd33c4df326d79 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_VENTANA=y diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig index cdc2c90ea6729afbfbdc8611d2ebee878ddaffbf..8c07c184a9cd84bd2f48d311ff8d58b14e8c381c 100644 --- a/configs/whistler_defconfig +++ b/configs/whistler_defconfig @@ -1,3 +1,4 @@ -CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_TEGRA=y ++S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_WHISTLER=y diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 717cd61bd69a9ba349b308fd9296272d22c37024..d27fcebd7c4654f4d4e9a9987e6f694adaf62268 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -14,7 +14,6 @@ * High Level Configuration Options */ #define CONFIG_ARMCORTEXA9 /* This is an ARM V7 CPU core */ -#define CONFIG_TEGRA /* which is a Tegra generic machine */ #define CONFIG_SYS_L2CACHE_OFF /* No L2 cache */ #include /* get chip and board defs */