diff options
| author | Marcel Ziswiler <marcel@ziswiler.com> | 2014-10-11 00:24:32 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-10-11 00:35:46 +0200 |
| commit | 0d262f71a183f17ec04e5585569a6f2802f98930 (patch) | |
| tree | 53830430cd2abc50e0d1a931c3f17a258e5e0d2f | |
| parent | 82134fd62f904935a7a73f8ee5e8d4b32f829406 (diff) | |
tegra: apalis_t30: master revamp
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>
| -rw-r--r-- | arch/arm/dts/tegra30-apalis.dts | 4 | ||||
| -rw-r--r-- | board/toradex/apalis_t30/Kconfig | 3 | ||||
| -rw-r--r-- | configs/apalis_t30_defconfig | 1 | ||||
| -rw-r--r-- | 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 5c717e2c4d..5bad3e7769 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 8f405901ea..f1dcda5927 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 24d637f11d..fc5e1e4d38 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 addcd47a00..3cde923b5f 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" |