diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-01 13:37:27 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-09-15 12:41:21 -0700 |
| commit | e26a6be71dd36659af343b9f0ec14ea981d23692 (patch) | |
| tree | ca930432571f968fd174b3cfaea6533d9ed62c60 /include | |
| parent | 0797d6dcb08ce12f7040a5252d304f6a862fa8b7 (diff) | |
tegra: Rename TEGRA2 to TEGRA
Some constants are actually better of with generic Tegra family names.
This also cleans up a few addresses which were in drivers rather than
in the tegra.h header file.
BUG=chromium-os:19004
TEST=build and boot on Seaboard
Change-Id: I1cabb5191a2b36648a37268069beb3b43c12d0e1
Reviewed-on: http://gerrit.chromium.org/gerrit/7128
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/harmony.h | 2 | ||||
| -rw-r--r-- | include/configs/tegra2-common.h | 5 | ||||
| -rw-r--r-- | include/serial.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 391aad36d3..2fb0a0cf8b 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -124,7 +124,7 @@ #define CONFIG_NAND_WP_GPIO GPIO_PC7 /* physical address to access nand at CS0 */ -#define CONFIG_SYS_NAND_BASE TEGRA2_NAND_BASE +#define CONFIG_SYS_NAND_BASE TEGRA_NAND_BASE /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h index 3dd3b2e873..7885cd7243 100644 --- a/include/configs/tegra2-common.h +++ b/include/configs/tegra2-common.h @@ -47,6 +47,7 @@ */ #define CONFIG_ARMCORTEXA9 /* This is an ARM V7 CPU core */ #define CONFIG_TEGRA2 /* in a NVidia Tegra2 core */ +#define CONFIG_TEGRA /* in the NVidia Tegra family */ #define CONFIG_MACH_TEGRA_GENERIC /* which is a Tegra generic machine */ #define CONFIG_SYS_NO_L2CACHE /* No L2 cache */ #define CONFIG_BOOTSTAGE /* Record boot time */ @@ -436,7 +437,7 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) -#define CONFIG_SYS_MEMTEST_START (TEGRA2_SDRC_CS0 + 0x600000) +#define CONFIG_SYS_MEMTEST_START (TEGRA_SDRC_CS0 + 0x600000) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000) #define CONFIG_SYS_LOAD_ADDR (0xA00800) /* default */ @@ -454,7 +455,7 @@ * Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM_1 TEGRA2_SDRC_CS0 +#define PHYS_SDRAM_1 TEGRA_SDRC_CS0 #define PHYS_SDRAM_1_SIZE 0x20000000 /* 512M */ #define CONFIG_SYS_TEXT_BASE 0x00E08000 diff --git a/include/serial.h b/include/serial.h index 3a1c888cf0..cbd88bcb84 100644 --- a/include/serial.h +++ b/include/serial.h @@ -28,7 +28,7 @@ extern struct serial_device * default_serial_console (void); defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \ defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \ - defined(CONFIG_TEGRA2) + defined(CONFIG_TEGRA) extern struct serial_device serial0_device; extern struct serial_device serial1_device; #if defined(CONFIG_SYS_NS16550_SERIAL) |