Patchwork [U-Boot] Remove duplicate / unused #defines on AM335x boards

login
register
mail settings
Submitter Mark Jackson
Date April 17, 2013, 6:22 p.m.
Message ID <516EE877.6000606@mimc.co.uk>
Download mbox | patch
Permalink /patch/237338/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Mark Jackson - April 17, 2013, 6:22 p.m.
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>
---
 include/configs/am335x_evm.h |   10 ++--------
 include/configs/pcm051.h     |    4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)
Tom Rini - April 29, 2013, 8:22 p.m.
On Wed, Apr 17, 2013 at 08:22:47AM -0000, Mark Jackson wrote:

> 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>

Applied to u-boot-ti/master, thanks!

Patch

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index ef00306..5739422 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -196,7 +196,6 @@ 
 					+ (8 * 1024 * 1024))

 #define CONFIG_SYS_LOAD_ADDR		0x81000000 /* Default load address */
-#define CONFIG_SYS_HZ			1000 /* 1ms clock */

 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
@@ -260,12 +259,11 @@ 
  /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 #define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
+#define CONFIG_SYS_HZ			1000	/* 1ms clock */

 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
@@ -360,11 +358,7 @@ 
 #define CONFIG_SYS_NAND_ECCSIZE		512
 #define CONFIG_SYS_NAND_ECCBYTES	14

-#define CONFIG_SYS_NAND_ECCSTEPS	4
-#define	CONFIG_SYS_NAND_ECCTOTAL	(CONFIG_SYS_NAND_ECCBYTES * \
-						CONFIG_SYS_NAND_ECCSTEPS)
-
-#define	CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE

 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index d0ea74e..2e3f08b 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -129,7 +129,6 @@ 
 					+ (8 * 1024 * 1024))

 #define CONFIG_SYS_LOAD_ADDR		0x80007fc0 /* Default load address */
-#define CONFIG_SYS_HZ			1000 /* 1ms clock */

 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
@@ -158,13 +157,12 @@ 
  /* Platform/Board specific defs */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 #define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-#define CONFIG_SYS_HZ			1000
+#define CONFIG_SYS_HZ			1000	/* 1ms clock */

 #define CONFIG_CONS_INDEX		1
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */