Update Apalis T30 as per the following commits
c369139234c03b1494394d12cd27009f47aa6606 tegra: dts: Add serial port details
461be2f96e4b87e5065208c6659a47dd0ad9e9f8 kconfig: remove redundant "string" type in arch and board Kconfigs
f1ef2b62339526df3b921bcfefd174ce76d4c624 kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig
Signed-off-by: Marcel Ziswiler marcel@ziswiler.com --- note: - this patch got re-based against u-boot-tegra/master which is currently how far the Apalis T30 support made it - above mentioned commits so far are only in u-boot/master as u-boot-tegra/master has not yet been re-based - as soon as u-boot-tegra/master gets re-based resp. subsequently pulled into u-boot/master this patch will be required
arch/arm/dts/tegra30-apalis.dts | 4 ++++ board/toradex/apalis_t30/Kconfig | 3 --- configs/apalis_t30_defconfig | 1 + include/configs/apalis_t30.h | 5 ----- 4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts index 5c717e2c..5bad3e7 100644 --- a/arch/arm/dts/tegra30-apalis.dts +++ b/arch/arm/dts/tegra30-apalis.dts @@ -6,6 +6,10 @@ model = "Toradex Apalis T30"; compatible = "toradex,apalis_t30", "nvidia,tegra30";
+ chosen { + stdout-path = &uarta; + }; + aliases { i2c0 = "/i2c@7000d000"; i2c1 = "/i2c@7000c000"; diff --git a/board/toradex/apalis_t30/Kconfig b/board/toradex/apalis_t30/Kconfig index 8f40590..f1dcda5 100644 --- a/board/toradex/apalis_t30/Kconfig +++ b/board/toradex/apalis_t30/Kconfig @@ -1,15 +1,12 @@ if TARGET_APALIS_T30
config SYS_BOARD - string default "apalis_t30"
config SYS_VENDOR - string default "toradex"
config SYS_CONFIG_NAME - string default "apalis_t30"
endif diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 24d637f..fc5e1e4 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -2,3 +2,4 @@ +S:CONFIG_TEGRA=y +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_APALIS_T30=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index addcd47..3cde923 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -11,11 +11,6 @@
#include "tegra30-common.h"
-/* Enable fdt support for Apalis T30. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-apalis -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE - /* High-level configuration options */ #define V_PROMPT "Apalis T30 # " #define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30"