bmips: configs: switch to size definitions
PATCH 1/1 bmips: configs: switch to size definitions
Signed-off-by Álvaro Fernández Rojas <[email protected]>
--- include/configs/bmips_bcm3380.h | 6 ++++-- include/configs/bmips_bcm6318.h | 6 ++++-- include/configs/bmips_bcm63268.h | 6 ++++-- include/configs/bmips_bcm6328.h | 6 ++++-- include/configs/bmips_bcm6338.h | 6 ++++-- include/configs/bmips_bcm6348.h | 6 ++++-- include/configs/bmips_bcm6358.h | 6 ++++-- include/configs/bmips_bcm6362.h | 8 +++++--- include/configs/bmips_bcm6368.h | 6 ++++-- include/configs/bmips_bcm6838.h | 6 ++++-- include/configs/bmips_common.h | 11 ++++++++--- include/configs/broadcom_bcm968380gerg.h | 2 +- include/configs/comtrend_ar5315u.h | 3 +-- include/configs/comtrend_ar5387un.h | 3 +-- include/configs/comtrend_ct5361.h | 3 +-- include/configs/comtrend_vr3032u.h | 3 +-- include/configs/comtrend_wap5813n.h | 3 +-- include/configs/huawei_hg556a.h | 3 +-- include/configs/netgear_cg3100d.h | 3 +-- include/configs/netgear_dgnd3700v2.h | 5 ++--- include/configs/sagem_f at st1704.h | 3 +-- include/configs/sfr_nb4_ser.h | 3 +-- 22 files changed, 61 insertions(+), 46 deletions(-)
include/configs/bmips_bcm3380.h +4 -2
@@ -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 */
include/configs/bmips_bcm6318.h +4 -2
@@ -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 */
include/configs/bmips_bcm63268.h +4 -2
@@ -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 */
include/configs/bmips_bcm6328.h +4 -2
@@ -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 */
include/configs/bmips_bcm6338.h +4 -2
@@ -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
include/configs/bmips_bcm6348.h +4 -2
@@ -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
include/configs/bmips_bcm6358.h +4 -2
@@ -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
include/configs/bmips_bcm6362.h +5 -3
@@ -1,11 +1,13 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright (C) 2018 Ãlvaro Fernández Rojas <[email protected]> +* Copyright (C) 2018 Álvaro Fernández Rojas <[email protected]> */ #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 */
include/configs/bmips_bcm6368.h +4 -2
@@ -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
include/configs/bmips_bcm6838.h +4 -2
@@ -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 */
include/configs/bmips_common.h +8 -3
@@ -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,8 +18,11 @@/* 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#endif /* __CONFIG_BMIPS_COMMON_H */
include/configs/broadcom_bcm968380gerg.h +1 -1
@@ -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
include/configs/comtrend_ar5315u.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/comtrend_ar5387un.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/comtrend_ct5361.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/comtrend_vr3032u.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/comtrend_wap5813n.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/huawei_hg556a.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
include/configs/netgear_cg3100d.h +1 -2
@@ -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
include/configs/netgear_dgnd3700v2.h +2 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright (C) 2018 Ãlvaro Fernández Rojas <[email protected]> +* Copyright (C) 2018 Álvaro Fernández Rojas <[email protected]> */ #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
include/configs/sagem_f at st1704.h +1 -2
@@ -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
include/configs/sfr_nb4_ser.h +1 -2
@@ -8,5 +8,4 @@#define CONFIG_REMAKE_ELF -#define CONFIG_ENV_SIZE (8 * 1024) - +#define CONFIG_ENV_SIZE SZ_8K
Signature · 1 line
2.20.1
PATCH 1/1 bmips: configs: switch to size definitions
Am 30.08.19 um 11:54 schrieb Álvaro Fernández Rojas:
Quoted 17 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- include/configs/bmips_bcm3380.h | 6 ++++-- include/configs/bmips_bcm6318.h | 6 ++++-- include/configs/bmips_bcm63268.h | 6 ++++-- include/configs/bmips_bcm6328.h | 6 ++++-- include/configs/bmips_bcm6338.h | 6 ++++-- include/configs/bmips_bcm6348.h | 6 ++++-- include/configs/bmips_bcm6358.h | 6 ++++-- include/configs/bmips_bcm6362.h | 8 +++++--- include/configs/bmips_bcm6368.h | 6 ++++-- include/configs/bmips_bcm6838.h | 6 ++++-- include/configs/bmips_common.h | 11 ++++++++--- include/configs/broadcom_bcm968380gerg.h | 2 +- include/configs/comtrend_ar5315u.h | 3 +-- include/configs/comtrend_ar5387un.h | 3 +-- include/configs/comtrend_ct5361.h | 3 +--
Quoted 8 lines
include/configs/comtrend_vr3032u.h | 3 +-- include/configs/comtrend_wap5813n.h | 3 +-- include/configs/huawei_hg556a.h | 3 +-- include/configs/netgear_cg3100d.h | 3 +-- include/configs/netgear_dgnd3700v2.h | 5 ++--- include/configs/sagem_f at st1704.h | 3 +-- include/configs/sfr_nb4_ser.h | 3 +-- 22 files changed, 61 insertions(+), 46 deletions(-)
Reviewed-by Daniel Schwierzeck <[email protected]>
Signature · 1 line
- Daniel
PATCH 1/1 bmips: configs: switch to size definitions
In reply to Álvaro Fernández RojasAm 30.08.19 um 11:54 schrieb Álvaro Fernández Rojas:
Quoted 17 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- include/configs/bmips_bcm3380.h | 6 ++++-- include/configs/bmips_bcm6318.h | 6 ++++-- include/configs/bmips_bcm63268.h | 6 ++++-- include/configs/bmips_bcm6328.h | 6 ++++-- include/configs/bmips_bcm6338.h | 6 ++++-- include/configs/bmips_bcm6348.h | 6 ++++-- include/configs/bmips_bcm6358.h | 6 ++++-- include/configs/bmips_bcm6362.h | 8 +++++--- include/configs/bmips_bcm6368.h | 6 ++++-- include/configs/bmips_bcm6838.h | 6 ++++-- include/configs/bmips_common.h | 11 ++++++++--- include/configs/broadcom_bcm968380gerg.h | 2 +- include/configs/comtrend_ar5315u.h | 3 +-- include/configs/comtrend_ar5387un.h | 3 +-- include/configs/comtrend_ct5361.h | 3 +--
Quoted 9 lines
include/configs/comtrend_vr3032u.h | 3 +-- include/configs/comtrend_wap5813n.h | 3 +-- include/configs/huawei_hg556a.h | 3 +-- include/configs/netgear_cg3100d.h | 3 +-- include/configs/netgear_dgnd3700v2.h | 5 ++--- include/configs/sagem_f at st1704.h | 3 +-- include/configs/sfr_nb4_ser.h | 3 +-- 22 files changed, 61 insertions(+), 46 deletions(-)
applied to u-boot-mips, thanks.
Signature · 1 line
- Daniel