aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Jackson2013-04-17 03:22:47 -0500
committerTom Rini2013-05-10 07:25:55 -0500
commit15191c91a240bd8683ca40e6c4b8b8c44b98412f (patch)
tree3230ee5a84eebf036c36c1c4d7dd361760fe55d7
parent85b7ac4588c3128e3702f7232b3fd46c7cd7cf43 (diff)
downloadu-boot-15191c91a240bd8683ca40e6c4b8b8c44b98412f.tar.gz
u-boot-15191c91a240bd8683ca40e6c4b8b8c44b98412f.tar.xz
u-boot-15191c91a240bd8683ca40e6c4b8b8c44b98412f.zip
Remove duplicate / unused #defines on AM335x boards
As part of a review of a recent patch to add a new AM335x board, Tom found several duplicate and/or unused #defines. This patch simply removes them. The two affected configs have been recompiled to check nothing was broken (from a compilation point of view !!) Reported-by: Tom Rini <trini@ti.com> Signed-off-by: Mark Jackson <mpfj-list@mimc.co.uk>
-rw-r--r--include/configs/am335x_evm.h10
-rw-r--r--include/configs/pcm051.h4
2 files changed, 3 insertions, 11 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ef00306a55..5739422c4c 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -196,7 +196,6 @@
196 + (8 * 1024 * 1024)) 196 + (8 * 1024 * 1024))
197 197
198#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ 198#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
199#define CONFIG_SYS_HZ 1000 /* 1ms clock */
200 199
201#define CONFIG_MMC 200#define CONFIG_MMC
202#define CONFIG_GENERIC_MMC 201#define CONFIG_GENERIC_MMC
@@ -260,12 +259,11 @@
260 /* Platform/Board specific defs */ 259 /* Platform/Board specific defs */
261#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ 260#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
262#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ 261#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
263#define CONFIG_SYS_HZ 1000 262#define CONFIG_SYS_HZ 1000 /* 1ms clock */
264 263
265/* NS16550 Configuration */ 264/* NS16550 Configuration */
266#define CONFIG_SYS_NS16550 265#define CONFIG_SYS_NS16550
267#define CONFIG_SYS_NS16550_SERIAL 266#define CONFIG_SYS_NS16550_SERIAL
268#define CONFIG_SERIAL_MULTI
269#define CONFIG_SYS_NS16550_REG_SIZE (-4) 267#define CONFIG_SYS_NS16550_REG_SIZE (-4)
270#define CONFIG_SYS_NS16550_CLK (48000000) 268#define CONFIG_SYS_NS16550_CLK (48000000)
271#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ 269#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
@@ -360,11 +358,7 @@
360#define CONFIG_SYS_NAND_ECCSIZE 512 358#define CONFIG_SYS_NAND_ECCSIZE 512
361#define CONFIG_SYS_NAND_ECCBYTES 14 359#define CONFIG_SYS_NAND_ECCBYTES 14
362 360
363#define CONFIG_SYS_NAND_ECCSTEPS 4 361#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
364#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \
365 CONFIG_SYS_NAND_ECCSTEPS)
366
367#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
368 362
369#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 363#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
370 364
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index d0ea74e0b4..2e3f08b5b6 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -129,7 +129,6 @@
129 + (8 * 1024 * 1024)) 129 + (8 * 1024 * 1024))
130 130
131#define CONFIG_SYS_LOAD_ADDR 0x80007fc0 /* Default load address */ 131#define CONFIG_SYS_LOAD_ADDR 0x80007fc0 /* Default load address */
132#define CONFIG_SYS_HZ 1000 /* 1ms clock */
133 132
134#define CONFIG_MMC 133#define CONFIG_MMC
135#define CONFIG_GENERIC_MMC 134#define CONFIG_GENERIC_MMC
@@ -158,13 +157,12 @@
158 /* Platform/Board specific defs */ 157 /* Platform/Board specific defs */
159#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ 158#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
160#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ 159#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
161#define CONFIG_SYS_HZ 1000 160#define CONFIG_SYS_HZ 1000 /* 1ms clock */
162 161
163#define CONFIG_CONS_INDEX 1 162#define CONFIG_CONS_INDEX 1
164/* NS16550 Configuration */ 163/* NS16550 Configuration */
165#define CONFIG_SYS_NS16550 164#define CONFIG_SYS_NS16550
166#define CONFIG_SYS_NS16550_SERIAL 165#define CONFIG_SYS_NS16550_SERIAL
167#define CONFIG_SERIAL_MULTI
168#define CONFIG_SYS_NS16550_REG_SIZE (-4) 166#define CONFIG_SYS_NS16550_REG_SIZE (-4)
169#define CONFIG_SYS_NS16550_CLK (48000000) 167#define CONFIG_SYS_NS16550_CLK (48000000)
170#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ 168#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */