V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: bcm283x: don't always define CONFIG_BCM2835 

Currently, CONFIG_BCM2835 is defined for all BCM283x builds and _BCM2836
is defined when building for that SoC. That means there isn't a single
define that means "exactly BCM2835". This will complicate future patches
where BCM2835-vs-anything-else needs to be determined simply.

Modify the code to define one or the other of CONFIG_BCM2835/BCM2836 so
future patches are simpler.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Stephen Warren 2016-03-16 21:40:56 -06:00 committed by Tom Rini
parent 7ad260a999
commit ed7481c7d1
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-bcm283x/include/mach/gpio.h
View File

@ -9,7 +9,7 @@
#ifndef _BCM2835_GPIO_H_ #ifndef _BCM2835_GPIO_H_
#define _BCM2835_GPIO_H_ #define _BCM2835_GPIO_H_
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define BCM2835_GPIO_BASE 0x3f200000 #define BCM2835_GPIO_BASE 0x3f200000
#else #else
#define BCM2835_GPIO_BASE 0x20200000 #define BCM2835_GPIO_BASE 0x20200000

2
arch/arm/mach-bcm283x/include/mach/mbox.h
View File

@ -38,7 +38,7 @@
/* Raw mailbox HW */ /* Raw mailbox HW */
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define BCM2835_MBOX_PHYSADDR 0x3f00b880 #define BCM2835_MBOX_PHYSADDR 0x3f00b880
#else #else
#define BCM2835_MBOX_PHYSADDR 0x2000b880 #define BCM2835_MBOX_PHYSADDR 0x2000b880

2
arch/arm/mach-bcm283x/include/mach/sdhci.h
View File

@ -7,7 +7,7 @@
#ifndef _BCM2835_SDHCI_H_ #ifndef _BCM2835_SDHCI_H_
#define _BCM2835_SDHCI_H_ #define _BCM2835_SDHCI_H_
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define BCM2835_SDHCI_BASE 0x3f300000 #define BCM2835_SDHCI_BASE 0x3f300000
#else #else
#define BCM2835_SDHCI_BASE 0x20300000 #define BCM2835_SDHCI_BASE 0x20300000

2
arch/arm/mach-bcm283x/include/mach/timer.h
View File

@ -7,7 +7,7 @@
#ifndef _BCM2835_TIMER_H #ifndef _BCM2835_TIMER_H
#define _BCM2835_TIMER_H #define _BCM2835_TIMER_H
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define BCM2835_TIMER_PHYSADDR 0x3f003000 #define BCM2835_TIMER_PHYSADDR 0x3f003000
#else #else
#define BCM2835_TIMER_PHYSADDR 0x20003000 #define BCM2835_TIMER_PHYSADDR 0x20003000

2
arch/arm/mach-bcm283x/include/mach/wdog.h
View File

@ -7,7 +7,7 @@
#ifndef _BCM2835_WDOG_H #ifndef _BCM2835_WDOG_H
#define _BCM2835_WDOG_H #define _BCM2835_WDOG_H
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define BCM2835_WDOG_PHYSADDR 0x3f100000 #define BCM2835_WDOG_PHYSADDR 0x3f100000
#else #else
#define BCM2835_WDOG_PHYSADDR 0x20100000 #define BCM2835_WDOG_PHYSADDR 0x20100000

2
arch/arm/mach-bcm283x/phys2bus.c
View File

@ -9,7 +9,7 @@
unsigned long phys_to_bus(unsigned long phys) unsigned long phys_to_bus(unsigned long phys)
{ {
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
return 0xc0000000 | phys; return 0xc0000000 | phys;
#else #else
return 0x40000000 | phys; return 0x40000000 | phys;

2
board/raspberrypi/rpi/rpi.c
View File

@ -31,7 +31,7 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
}; };
static const struct pl01x_serial_platdata serial_platdata = { static const struct pl01x_serial_platdata serial_platdata = {
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
.base = 0x3f201000, .base = 0x3f201000,
#else #else
.base = 0x20201000, .base = 0x20201000,

5
include/configs/rpi-common.h
View File

@ -11,7 +11,6 @@
#include <asm/arch/timer.h> #include <asm/arch/timer.h>
/* Architecture, CPU, etc.*/ /* Architecture, CPU, etc.*/
#define CONFIG_BCM2835
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_TIMER_RATE 1000000 #define CONFIG_SYS_TIMER_RATE 1000000
@ -26,7 +25,7 @@
* chose to use someone else's previously registered machine ID (3139, MX51_GGC) * chose to use someone else's previously registered machine ID (3139, MX51_GGC)
* rather than obtaining a valid ID:-/ * rather than obtaining a valid ID:-/
*/ */
#ifndef CONFIG_BCM2836 #ifdef CONFIG_BCM2835
#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 #define CONFIG_MACH_TYPE MACH_TYPE_BCM2708
#endif #endif
@ -80,7 +79,7 @@
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2 #define CONFIG_USB_DWC2
#ifdef CONFIG_BCM2836 #ifndef CONFIG_BCM2835
#define CONFIG_USB_DWC2_REG_ADDR 0x3f980000 #define CONFIG_USB_DWC2_REG_ADDR 0x3f980000
#else #else
#define CONFIG_USB_DWC2_REG_ADDR 0x20980000 #define CONFIG_USB_DWC2_REG_ADDR 0x20980000

1
include/configs/rpi.h
View File

@ -7,6 +7,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_BCM2835
#define CONFIG_SYS_CACHELINE_SIZE 32 #define CONFIG_SYS_CACHELINE_SIZE 32
#include "rpi-common.h" #include "rpi-common.h"