bmips: configs: switch to size definitions

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2019-08-30 11:54:27 +02:00 committed by Daniel Schwierzeck
parent 9e484636f1
commit 55daf1c45c
22 changed files with 58 additions and 45 deletions

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM3380_H #ifndef __CONFIG_BMIPS_BCM3380_H
#define __CONFIG_BMIPS_BCM3380_H #define __CONFIG_BMIPS_BCM3380_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 166500000 #define CONFIG_SYS_MIPS_TIMER_FREQ 166500000
@ -13,11 +15,11 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM3380_H */ #endif /* __CONFIG_BMIPS_BCM3380_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6318_H #ifndef __CONFIG_BMIPS_BCM6318_H
#define __CONFIG_BMIPS_BCM6318_H #define __CONFIG_BMIPS_BCM6318_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 166500000 #define CONFIG_SYS_MIPS_TIMER_FREQ 166500000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM6318_H */ #endif /* __CONFIG_BMIPS_BCM6318_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM63268_H #ifndef __CONFIG_BMIPS_BCM63268_H
#define __CONFIG_BMIPS_BCM63268_H #define __CONFIG_BMIPS_BCM63268_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM63268_H */ #endif /* __CONFIG_BMIPS_BCM63268_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6328_H #ifndef __CONFIG_BMIPS_BCM6328_H
#define __CONFIG_BMIPS_BCM6328_H #define __CONFIG_BMIPS_BCM6328_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 160000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 160000000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM6328_H */ #endif /* __CONFIG_BMIPS_BCM6328_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6338_H #ifndef __CONFIG_BMIPS_BCM6338_H
#define __CONFIG_BMIPS_BCM6338_H #define __CONFIG_BMIPS_BCM6338_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 120000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 120000000
@ -13,11 +15,11 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_BASE 0xbfc00000

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6348_H #ifndef __CONFIG_BMIPS_BCM6348_H
#define __CONFIG_BMIPS_BCM6348_H #define __CONFIG_BMIPS_BCM6348_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 128000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 128000000
@ -18,11 +20,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_BASE 0xbfc00000

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6358_H #ifndef __CONFIG_BMIPS_BCM6358_H
#define __CONFIG_BMIPS_BCM6358_H #define __CONFIG_BMIPS_BCM6358_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 150000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 150000000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#define CONFIG_SYS_FLASH_BASE 0xbe000000 #define CONFIG_SYS_FLASH_BASE 0xbe000000

View File

@ -1,11 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0+ */ /* SPDX-License-Identifier: GPL-2.0+ */
/* /*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com> * Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*/ */
#ifndef __CONFIG_BMIPS_BCM6362_H #ifndef __CONFIG_BMIPS_BCM6362_H
#define __CONFIG_BMIPS_BCM6362_H #define __CONFIG_BMIPS_BCM6362_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM6362_H */ #endif /* __CONFIG_BMIPS_BCM6362_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6368_H #ifndef __CONFIG_BMIPS_BCM6368_H
#define __CONFIG_BMIPS_BCM6368_H #define __CONFIG_BMIPS_BCM6368_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 200000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 200000000
@ -20,11 +22,11 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#define CONFIG_SYS_FLASH_BASE 0xb8000000 #define CONFIG_SYS_FLASH_BASE 0xb8000000

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_BCM6838_H #ifndef __CONFIG_BMIPS_BCM6838_H
#define __CONFIG_BMIPS_BCM6838_H #define __CONFIG_BMIPS_BCM6838_H
#include <linux/sizes.h>
/* CPU */ /* CPU */
#define CONFIG_SYS_MIPS_TIMER_FREQ 160000000 #define CONFIG_SYS_MIPS_TIMER_FREQ 160000000
@ -13,11 +15,11 @@
#define CONFIG_SYS_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000
/* U-Boot */ /* 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) #if defined(CONFIG_BMIPS_BOOT_RAM)
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_INIT_SP_OFFSET 0x2000 #define CONFIG_SYS_INIT_SP_OFFSET SZ_8K
#endif #endif
#endif /* __CONFIG_BMIPS_BCM6838_H */ #endif /* __CONFIG_BMIPS_BCM6838_H */

View File

@ -6,6 +6,8 @@
#ifndef __CONFIG_BMIPS_COMMON_H #ifndef __CONFIG_BMIPS_COMMON_H
#define __CONFIG_BMIPS_COMMON_H #define __CONFIG_BMIPS_COMMON_H
#include <linux/sizes.h>
/* ETH */ /* ETH */
#define CONFIG_PHY_RESET_DELAY 20 #define CONFIG_PHY_RESET_DELAY 20
#define CONFIG_SYS_RX_ETH_BUFFER 6 #define CONFIG_SYS_RX_ETH_BUFFER 6
@ -16,9 +18,9 @@
/* Memory usage */ /* Memory usage */
#define CONFIG_SYS_MAXARGS 24 #define CONFIG_SYS_MAXARGS 24
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN SZ_2M
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024) #define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K
#define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_CBSIZE SZ_512
/* U-Boot */ /* U-Boot */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

View File

@ -6,7 +6,7 @@
#include <configs/bmips_common.h> #include <configs/bmips_common.h>
#include <configs/bmips_bcm6838.h> #include <configs/bmips_bcm6838.h>
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K
#ifdef CONFIG_NAND #ifdef CONFIG_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -8,7 +8,7 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K
#ifdef CONFIG_NAND #ifdef CONFIG_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -6,5 +6,4 @@
#include <configs/bmips_common.h> #include <configs/bmips_common.h>
#include <configs/bmips_bcm3380.h> #include <configs/bmips_bcm3380.h>
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */ /* SPDX-License-Identifier: GPL-2.0+ */
/* /*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com> * Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*/ */
#include <configs/bmips_common.h> #include <configs/bmips_common.h>
@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -6,5 +6,4 @@
#include <configs/bmips_common.h> #include <configs/bmips_common.h>
#include <configs/bmips_bcm6338.h> #include <configs/bmips_bcm6338.h>
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K

View File

@ -8,5 +8,4 @@
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE SZ_8K