diff options
| author | Marcel Ziswiler <marcel@ziswiler.com> | 2014-10-11 00:34:04 +0200 |
|---|---|---|
| committer | Tom Warren <twarren@nvidia.com> | 2014-10-22 09:30:55 -0700 |
| commit | 9aafef4f360616a507578b8868092f096b093aa9 (patch) | |
| tree | daf13d495db3122967e60288d9b8aeff7b5351ff | |
| parent | f38aaa28beccdcb712ff44278ac85acf1038724f (diff) | |
| download | u-boot-imx-9aafef4f360616a507578b8868092f096b093aa9.zip u-boot-imx-9aafef4f360616a507578b8868092f096b093aa9.tar.gz u-boot-imx-9aafef4f360616a507578b8868092f096b093aa9.tar.bz2 | |
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>
Signed-off-by: Tom Warren <twarren@nvidia.com>
| -rw-r--r-- | arch/arm/dts/tegra30-apalis.dts | 4 | ||||
| -rw-r--r-- | board/toradex/apalis_t30/Kconfig | 3 | ||||
| -rw-r--r-- | include/configs/apalis_t30.h | 1 |
3 files changed, 4 insertions, 4 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/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 0bc26b5..3cde923 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -11,7 +11,6 @@ #include "tegra30-common.h" - /* High-level configuration options */ #define V_PROMPT "Apalis T30 # " #define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30" |