bmips: configs: switch to size definitions

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>

diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h
index e2f9e76a978e85014ba6e60d2b2e8c5e690433d7..573ff3e40189add5b6eb7ad5279ac14eacb8ff74 100644 (file)
--- a/include/configs/bmips_bcm3380.h
+++ b/include/configs/bmips_bcm3380.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM3380_H
 #define __CONFIG_BMIPS_BCM3380_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     166500000
 
@@ -13,11 +15,11 @@
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM3380_H */

diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h
index 476aa51af30d7018738efa63fafb2d46ea5a4ece..c7e7119aafd14b2438b76a4647a73120c8e1fa70 100644 (file)
--- a/include/configs/bmips_bcm6318.h
+++ b/include/configs/bmips_bcm6318.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6318_H
 #define __CONFIG_BMIPS_BCM6318_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     166500000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6318_H */

diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h
index 1456b0ec479f8529c0f518230e07df99b730f2cd..45f26bb309757609db1c05021e96a22e9c5c99d5 100644 (file)
--- a/include/configs/bmips_bcm63268.h
+++ b/include/configs/bmips_bcm63268.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM63268_H
 #define __CONFIG_BMIPS_BCM63268_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     200000000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM63268_H */

diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h
index faf9abcc3e450038fd62800e420304ad00572a98..8d594387853f4d80a76d4174eaac32e0ffd4d64b 100644 (file)
--- a/include/configs/bmips_bcm6328.h
+++ b/include/configs/bmips_bcm6328.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6328_H
 #define __CONFIG_BMIPS_BCM6328_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     160000000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6328_H */

diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h
index 83050c94a6b74dcac9cc7e8c8a6f589a637da89b..38dd9e3af3aaf4841d286c6d1f03a996dd47f20a 100644 (file)
--- a/include/configs/bmips_bcm6338.h
+++ b/include/configs/bmips_bcm6338.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6338_H
 #define __CONFIG_BMIPS_BCM6338_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     120000000
 
@@ -13,11 +15,11 @@
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #define CONFIG_SYS_FLASH_BASE                  0xbfc00000

diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h
index 5eb8b0f9d0988f9254cf90780fd9a08abe02feaf..061d6b25b714850ed1f8c5497aec27a9a57897e5 100644 (file)
--- a/include/configs/bmips_bcm6348.h
+++ b/include/configs/bmips_bcm6348.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6348_H
 #define __CONFIG_BMIPS_BCM6348_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     128000000
 
@@ -18,11 +20,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #define CONFIG_SYS_FLASH_BASE                  0xbfc00000

diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h
index 7becf3fcb9259753c3ac1f0cd4c36f4b86b8984c..583217d26217b9de132cea173279e6aa769384a6 100644 (file)
--- a/include/configs/bmips_bcm6358.h
+++ b/include/configs/bmips_bcm6358.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6358_H
 #define __CONFIG_BMIPS_BCM6358_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     150000000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #define CONFIG_SYS_FLASH_BASE                  0xbe000000

diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h
index 60777207e1b337b9d988b5fbb84e13d0fcad3eb1..570bc3b33d3dc6aa73207f9267150059b18e5340 100644 (file)
--- a/include/configs/bmips_bcm6362.h
+++ b/include/configs/bmips_bcm6362.h
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Ã\83Â\81lvaro FernÃ\83¡ndez Rojas <noltari@gmail.com>
+ * Copyright (C) 2018 Ã\81lvaro Fernández Rojas <noltari@gmail.com>
  */
 
 #ifndef __CONFIG_BMIPS_BCM6362_H
 #define __CONFIG_BMIPS_BCM6362_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     200000000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6362_H */

diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h
index 1a57476e0556dd55489bb104a543d58ac9aab62c..ab5bdac7268aef0a168b270816e328ab5fb35f3f 100644 (file)
--- a/include/configs/bmips_bcm6368.h
+++ b/include/configs/bmips_bcm6368.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6368_H
 #define __CONFIG_BMIPS_BCM6368_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     200000000
 
@@ -20,11 +22,11 @@
 #define CONFIG_USB_OHCI_NEW
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #define CONFIG_SYS_FLASH_BASE                  0xb8000000

diff --git a/include/configs/bmips_bcm6838.h b/include/configs/bmips_bcm6838.h
index d735c51efc806b4dfd18025d24eed4287a520913..f1ff05414d55b93109b904b4504bacac0d548d2b 100644 (file)
--- a/include/configs/bmips_bcm6838.h
+++ b/include/configs/bmips_bcm6838.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_BCM6838_H
 #define __CONFIG_BMIPS_BCM6838_H
 
+#include <linux/sizes.h>
+
 /* CPU */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     160000000
 
@@ -13,11 +15,11 @@
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
 /* U-Boot */
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + 0x100000
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_1M
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_INIT_SP_OFFSET      0x2000
+#define CONFIG_SYS_INIT_SP_OFFSET      SZ_8K
 #endif
 
 #endif /* __CONFIG_BMIPS_BCM6838_H */

diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h
index ca079fa2e2ca8ba2d2baee119658ca69368bd331..3cb2d4050d09c4c696b6a8b62bf48462fa26307b 100644 (file)
--- a/include/configs/bmips_common.h
+++ b/include/configs/bmips_common.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_BMIPS_COMMON_H
 #define __CONFIG_BMIPS_COMMON_H
 
+#include <linux/sizes.h>
+
 /* ETH */
 #define CONFIG_PHY_RESET_DELAY         20
 #define CONFIG_SYS_RX_ETH_BUFFER       6
@@ -16,9 +18,9 @@
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS             24
-#define CONFIG_SYS_MALLOC_LEN          (2 * 1024 * 1024)
-#define CONFIG_SYS_BOOTPARAMS_LEN      (128 * 1024)
-#define CONFIG_SYS_CBSIZE              512
+#define CONFIG_SYS_MALLOC_LEN          SZ_2M
+#define CONFIG_SYS_BOOTPARAMS_LEN      SZ_128K
+#define CONFIG_SYS_CBSIZE              SZ_512
 
 /* U-Boot */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/broadcom_bcm968380gerg.h b/include/configs/broadcom_bcm968380gerg.h
index aa6ce67d53363dfd10a57120ab3828a7ca06f666..b0e93376fe376906deb8059c4529b48c842150d4 100644 (file)
--- a/include/configs/broadcom_bcm968380gerg.h
+++ b/include/configs/broadcom_bcm968380gerg.h
@@ -6,7 +6,7 @@
 #include <configs/bmips_common.h>
 #include <configs/bmips_bcm6838.h>
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
+#define CONFIG_ENV_SIZE        SZ_8K
 
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1

diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h
index a5eb3aea1954ab6f9db8674b406118a2cdb5601f..1da96c163a16dbab73fde90dd2d92e0a1490396a 100644 (file)
--- a/include/configs/comtrend_ar5315u.h
+++ b/include/configs/comtrend_ar5315u.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h
index 71c5ba45be5d3d3cea939899ccd3defc63233962..73e6a5dac79bb52da66ebff5641a60e3707694f8 100644 (file)
--- a/include/configs/comtrend_ar5387un.h
+++ b/include/configs/comtrend_ar5387un.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h
index da7059230667ed9091c3810cebbdc551f90d2669..72f9ecbb06f3b3641885a82b37f41ccb77fbb898 100644 (file)
--- a/include/configs/comtrend_ct5361.h
+++ b/include/configs/comtrend_ct5361.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h
index d625101ecbafab342767755a55d1cc47b3d1100c..cb888056bcfb4fd09f9d40b5ccf1a9df02afc67f 100644 (file)
--- a/include/configs/comtrend_vr3032u.h
+++ b/include/configs/comtrend_vr3032u.h
@@ -8,7 +8,7 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
+#define CONFIG_ENV_SIZE        SZ_8K
 
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1

diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h
index 7070a1c757f169b4d1b4afc87c85539c1ad6179c..b67f6548e68263e3c9d73457e36051ccff341fb7 100644 (file)
--- a/include/configs/comtrend_wap5813n.h
+++ b/include/configs/comtrend_wap5813n.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h
index 1c9bee6d58d6794deb42a3c1faa6c7dde4d128e0..2aa5c666432507156fb6f3baf77f771a5818f185 100644 (file)
--- a/include/configs/huawei_hg556a.h
+++ b/include/configs/huawei_hg556a.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h
index d541e9cee837a7a05ed8dd161726b351f80ca187..e5a96015197bc6a702a7ca2a9228f20cfa1a0ae8 100644 (file)
--- a/include/configs/netgear_cg3100d.h
+++ b/include/configs/netgear_cg3100d.h
@@ -6,5 +6,4 @@
 #include <configs/bmips_common.h>
 #include <configs/bmips_bcm3380.h>
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/netgear_dgnd3700v2.h b/include/configs/netgear_dgnd3700v2.h
index 9edaec9bff5be3175c5cadc3091eb50b651075e9..3baa17ae6183012e9cf989d1af59f45bc760733d 100644 (file)
--- a/include/configs/netgear_dgnd3700v2.h
+++ b/include/configs/netgear_dgnd3700v2.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Ã\83Â\81lvaro FernÃ\83¡ndez Rojas <noltari@gmail.com>
+ * Copyright (C) 2018 Ã\81lvaro Fernández Rojas <noltari@gmail.com>
  */
 
 #include <configs/bmips_common.h>
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/sagem_f@st1704.h b/include/configs/sagem_f@st1704.h
index 7171dc6760d62bbba87dbcbf958ca0de8d8eca6c..5a526d9d8b3269b0569d9dea6adea85cf50e33cd 100644 (file)
--- a/include/configs/sagem_f@st1704.h
+++ b/include/configs/sagem_f@st1704.h
@@ -6,5 +6,4 @@
 #include <configs/bmips_common.h>
 #include <configs/bmips_bcm6338.h>
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K

diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h
index 1c9bee6d58d6794deb42a3c1faa6c7dde4d128e0..2aa5c666432507156fb6f3baf77f771a5818f185 100644 (file)
--- a/include/configs/sfr_nb4_ser.h
+++ b/include/configs/sfr_nb4_ser.h
@@ -8,5 +8,4 @@
 
 #define CONFIG_REMAKE_ELF
 
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-
+#define CONFIG_ENV_SIZE        SZ_8K