karo: config: prevent conversion of numerical value '1' in header files to 'y' by...

The script 'tools/scripts/define2mk.sed' converts all defines with the
value '1' to 'y' to facilitate conditional compilation in Makefiles.
Prepend a '0x' prefix to values of '1' which should be kept as
numbers.

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 6447c1d5ba5cfdb3521e2ebc57ffa4d24b69c277..ac7f3d94e3a09d087aaa331e707a1142e57e0c5f 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -53,7 +53,7 @@
 /*
  * Memory configuration options
  */
 /*
  * Memory configuration options
  */

-#define CONFIG_NR_DRAM_BANKS           1               /* 1 bank of SDRAM */
+#define CONFIG_NR_DRAM_BANKS           0x1             /* 1 bank of SDRAM */

 #define PHYS_SDRAM_1                   0x40000000      /* SDRAM Bank #1 */
 #define CONFIG_STACKSIZE               SZ_64K
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
 #define PHYS_SDRAM_1                   0x40000000      /* SDRAM Bank #1 */
 #define CONFIG_STACKSIZE               SZ_64K
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M


@@ -241,8 +241,8 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4

-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1

 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 0281d2530de0852753d1a17dcf122e2b1e75969a..dd7cf74a23d909c488a35a06d784a757c4c4564e 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -54,7 +54,7 @@
  * Memory configuration options
  */
 #define CONFIG_SYS_SDRAM_DDR3
  * Memory configuration options
  */
 #define CONFIG_SYS_SDRAM_DDR3

-#define CONFIG_NR_DRAM_BANKS           1               /*  1 bank of SDRAM */
+#define CONFIG_NR_DRAM_BANKS           0x1             /* '1' would be converted to 'y' by define2mk.sed */

 #define PHYS_SDRAM_1                   0x80000000      /* SDRAM Bank #1 */
 #define CONFIG_MAX_RAM_BANK_SIZE       SZ_1G
 
 #define PHYS_SDRAM_1                   0x80000000      /* SDRAM Bank #1 */
 #define CONFIG_MAX_RAM_BANK_SIZE       SZ_1G
 


@@ -228,9 +228,9 @@
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_CMD_NAND_TRIMFFS

-#define CONFIG_SYS_NAND_MAX_CHIPS      1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1

 #define CONFIG_SYS_NAND_MAXBAD         20 /* Max. number of bad blocks guaranteed by manufacturer */
 #define CONFIG_SYS_NAND_MAXBAD         20 /* Max. number of bad blocks guaranteed by manufacturer */

-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1

 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index dff09cecbc69cadc084a16e6c0db1b9bf904f822..19bb7c49865b84d9ffe19697e451c8aaa37824b0 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -210,8 +210,8 @@
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS

-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1

 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index fad1b28d3af4bb41b658eb0dcfdc02fc10d24315..7502e6726b0323f8ccb7e9b0b705837c62d49413 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -225,8 +225,8 @@
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS

-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1

 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #ifdef CONFIG_ENV_IS_IN_NAND

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 8b3d40fbbfaa107790b0c5576017289c97593393..22f4c1007acddd1bce8f7321ab238c397d883d1d 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -45,7 +45,7 @@
 /*
  * Memory configuration options
  */
 /*
  * Memory configuration options
  */

-#define CONFIG_NR_DRAM_BANKS           1               /* # of SDRAM banks */
+#define CONFIG_NR_DRAM_BANKS           0x1             /* # of SDRAM banks */

 #define PHYS_SDRAM_1                   0x10000000      /* Base address of bank 1 */
 #ifdef CONFIG_SYS_SDRAM_BUS_WIDTH
 #define PHYS_SDRAM_1_WIDTH             CONFIG_SYS_SDRAM_BUS_WIDTH
 #define PHYS_SDRAM_1                   0x10000000      /* Base address of bank 1 */
 #ifdef CONFIG_SYS_SDRAM_BUS_WIDTH
 #define PHYS_SDRAM_1_WIDTH             CONFIG_SYS_SDRAM_BUS_WIDTH


@@ -319,9 +319,9 @@
 #define CONFIG_APBH_DMA_BURST8
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_APBH_DMA_BURST8
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4

-#define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_MAX_FLASH_BANKS     0x1
+#define CONFIG_SYS_NAND_MAX_CHIPS      0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE     0x1

 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BASE           0x00000000


@@ -366,7 +366,7 @@
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0

-#define CONFIG_SYS_MMC_ENV_PART                1
+#define CONFIG_SYS_MMC_ENV_PART                0x1

 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #else
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #else