* [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835
@ 2016-03-17 3:40 Stephen Warren
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Stephen Warren @ 2016-03-17 3:40 UTC (permalink / raw)
To: u-boot
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>
---
arch/arm/mach-bcm283x/include/mach/gpio.h | 2 +-
arch/arm/mach-bcm283x/include/mach/mbox.h | 2 +-
arch/arm/mach-bcm283x/include/mach/sdhci.h | 2 +-
arch/arm/mach-bcm283x/include/mach/timer.h | 2 +-
arch/arm/mach-bcm283x/include/mach/wdog.h | 2 +-
arch/arm/mach-bcm283x/phys2bus.c | 2 +-
board/raspberrypi/rpi/rpi.c | 2 +-
include/configs/rpi-common.h | 5 ++---
include/configs/rpi.h | 1 +
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h
index c8ef8f528a21..e6e5d1605d0a 100644
--- a/arch/arm/mach-bcm283x/include/mach/gpio.h
+++ b/arch/arm/mach-bcm283x/include/mach/gpio.h
@@ -9,7 +9,7 @@
#ifndef _BCM2835_GPIO_H_
#define _BCM2835_GPIO_H_
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define BCM2835_GPIO_BASE 0x3f200000
#else
#define BCM2835_GPIO_BASE 0x20200000
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 4a143917f0f8..627acb85dc8c 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -38,7 +38,7 @@
/* Raw mailbox HW */
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define BCM2835_MBOX_PHYSADDR 0x3f00b880
#else
#define BCM2835_MBOX_PHYSADDR 0x2000b880
diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h
index 2a21ccbf66ba..64e582c114f5 100644
--- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
+++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
@@ -7,7 +7,7 @@
#ifndef _BCM2835_SDHCI_H_
#define _BCM2835_SDHCI_H_
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define BCM2835_SDHCI_BASE 0x3f300000
#else
#define BCM2835_SDHCI_BASE 0x20300000
diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h
index 004c24be365a..2a85f230e86d 100644
--- a/arch/arm/mach-bcm283x/include/mach/timer.h
+++ b/arch/arm/mach-bcm283x/include/mach/timer.h
@@ -7,7 +7,7 @@
#ifndef _BCM2835_TIMER_H
#define _BCM2835_TIMER_H
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define BCM2835_TIMER_PHYSADDR 0x3f003000
#else
#define BCM2835_TIMER_PHYSADDR 0x20003000
diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h
index cbc350e84b90..7741d7ba1558 100644
--- a/arch/arm/mach-bcm283x/include/mach/wdog.h
+++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
@@ -7,7 +7,7 @@
#ifndef _BCM2835_WDOG_H
#define _BCM2835_WDOG_H
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define BCM2835_WDOG_PHYSADDR 0x3f100000
#else
#define BCM2835_WDOG_PHYSADDR 0x20100000
diff --git a/arch/arm/mach-bcm283x/phys2bus.c b/arch/arm/mach-bcm283x/phys2bus.c
index fc1c29905de3..8e9f49240ff7 100644
--- a/arch/arm/mach-bcm283x/phys2bus.c
+++ b/arch/arm/mach-bcm283x/phys2bus.c
@@ -9,7 +9,7 @@
unsigned long phys_to_bus(unsigned long phys)
{
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
return 0xc0000000 | phys;
#else
return 0x40000000 | phys;
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index da4b6ff234d6..1fd7591f3325 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -31,7 +31,7 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
};
static const struct pl01x_serial_platdata serial_platdata = {
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
.base = 0x3f201000,
#else
.base = 0x20201000,
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 1c3642612e4b..12e1adde204c 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -11,7 +11,6 @@
#include <asm/arch/timer.h>
/* Architecture, CPU, etc.*/
-#define CONFIG_BCM2835
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_TIMER_RATE 1000000
@@ -26,7 +25,7 @@
* chose to use someone else's previously registered machine ID (3139, MX51_GGC)
* rather than obtaining a valid ID:-/
*/
-#ifndef CONFIG_BCM2836
+#ifdef CONFIG_BCM2835
#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708
#endif
@@ -80,7 +79,7 @@
#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
-#ifdef CONFIG_BCM2836
+#ifndef CONFIG_BCM2835
#define CONFIG_USB_DWC2_REG_ADDR 0x3f980000
#else
#define CONFIG_USB_DWC2_REG_ADDR 0x20980000
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 86422e390da2..a788ce42e44c 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -7,6 +7,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#define CONFIG_BCM2835
#define CONFIG_SYS_CACHELINE_SIZE 32
#include "rpi-common.h"
--
2.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox
2016-03-17 3:40 [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Stephen Warren
@ 2016-03-17 3:40 ` Stephen Warren
2016-03-17 15:54 ` Tom Rini
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
2016-03-17 15:54 ` [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Tom Rini
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 2 replies; 8+ messages in thread
From: Stephen Warren @ 2016-03-17 3:40 UTC (permalink / raw)
To: u-boot
Fixes:
arch/arm/mach-bcm283x/mbox.c: In function ?bcm2835_mbox_call_prop?:
arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
arch/arm/mach-bcm283x/mbox.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 311bd8feaab0..ec3f417f40f4 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -115,7 +115,9 @@ int bcm2835_mbox_call_prop(u32 chan, struct bcm2835_mbox_hdr *buffer)
(unsigned long)((void *)buffer +
roundup(buffer->buf_size, ARCH_DMA_MINALIGN)));
- ret = bcm2835_mbox_call_raw(chan, phys_to_bus((u32)buffer), &rbuffer);
+ ret = bcm2835_mbox_call_raw(chan,
+ phys_to_bus((unsigned long)buffer),
+ &rbuffer);
if (ret)
return ret;
@@ -123,7 +125,7 @@ int bcm2835_mbox_call_prop(u32 chan, struct bcm2835_mbox_hdr *buffer)
(unsigned long)((void *)buffer +
roundup(buffer->buf_size, ARCH_DMA_MINALIGN)));
- if (rbuffer != phys_to_bus((u32)buffer)) {
+ if (rbuffer != phys_to_bus((unsigned long)buffer)) {
printf("mbox: Response buffer mismatch\n");
return -1;
}
--
2.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835
2016-03-17 3:40 [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Stephen Warren
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
@ 2016-03-17 15:54 ` Tom Rini
2016-03-17 17:35 ` Stephen Warren
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 1 reply; 8+ messages in thread
From: Tom Rini @ 2016-03-17 15:54 UTC (permalink / raw)
To: u-boot
On Wed, Mar 16, 2016 at 09:40:56PM -0600, Stephen Warren wrote:
> 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>
[snip]
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index 86422e390da2..a788ce42e44c 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -7,6 +7,7 @@
> #ifndef __CONFIG_H
> #define __CONFIG_H
>
> +#define CONFIG_BCM2835
> #define CONFIG_SYS_CACHELINE_SIZE 32
>
> #include "rpi-common.h"
Shouldn't we take this as the time to move it to
arch/arm/mach-bcm283x/Kconfig ?
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160317/df883afd/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
@ 2016-03-17 15:54 ` Tom Rini
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-03-17 15:54 UTC (permalink / raw)
To: u-boot
On Wed, Mar 16, 2016 at 09:40:57PM -0600, Stephen Warren wrote:
> Fixes:
> arch/arm/mach-bcm283x/mbox.c: In function ?bcm2835_mbox_call_prop?:
> arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160317/5b4e6fef/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835
2016-03-17 15:54 ` [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Tom Rini
@ 2016-03-17 17:35 ` Stephen Warren
2016-03-17 18:08 ` Tom Rini
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Warren @ 2016-03-17 17:35 UTC (permalink / raw)
To: u-boot
On 03/17/2016 09:54 AM, Tom Rini wrote:
> On Wed, Mar 16, 2016 at 09:40:56PM -0600, Stephen Warren wrote:
>
>> 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>
> [snip]
>> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
>> index 86422e390da2..a788ce42e44c 100644
>> --- a/include/configs/rpi.h
>> +++ b/include/configs/rpi.h
>> @@ -7,6 +7,7 @@
>> #ifndef __CONFIG_H
>> #define __CONFIG_H
>>
>> +#define CONFIG_BCM2835
>> #define CONFIG_SYS_CACHELINE_SIZE 32
>>
>> #include "rpi-common.h"
>
> Shouldn't we take this as the time to move it to
> arch/arm/mach-bcm283x/Kconfig ?
It is probably time yes, although I'd rather do that in a separate patch
either way. I should be able to work that patch up before sending the
actual RPi3 board file patches.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835
2016-03-17 17:35 ` Stephen Warren
@ 2016-03-17 18:08 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-03-17 18:08 UTC (permalink / raw)
To: u-boot
On Thu, Mar 17, 2016 at 11:35:39AM -0600, Stephen Warren wrote:
> On 03/17/2016 09:54 AM, Tom Rini wrote:
> >On Wed, Mar 16, 2016 at 09:40:56PM -0600, Stephen Warren wrote:
> >
> >>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>
> >[snip]
> >>diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> >>index 86422e390da2..a788ce42e44c 100644
> >>--- a/include/configs/rpi.h
> >>+++ b/include/configs/rpi.h
> >>@@ -7,6 +7,7 @@
> >> #ifndef __CONFIG_H
> >> #define __CONFIG_H
> >>
> >>+#define CONFIG_BCM2835
> >> #define CONFIG_SYS_CACHELINE_SIZE 32
> >>
> >> #include "rpi-common.h"
> >
> >Shouldn't we take this as the time to move it to
> >arch/arm/mach-bcm283x/Kconfig ?
>
> It is probably time yes, although I'd rather do that in a separate
> patch either way. I should be able to work that patch up before
> sending the actual RPi3 board file patches.
OK:
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160317/d811fc30/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot, 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835
2016-03-17 3:40 [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Stephen Warren
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
2016-03-17 15:54 ` [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Tom Rini
@ 2016-03-27 22:25 ` Tom Rini
2 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-03-27 22:25 UTC (permalink / raw)
To: u-boot
On Wed, Mar 16, 2016 at 09:40:56PM -0600, Stephen Warren wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160327/25f41a71/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot, 2/2] ARM: bcm2835: fix 64-bit build warning in mbox
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
2016-03-17 15:54 ` Tom Rini
@ 2016-03-27 22:25 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2016-03-27 22:25 UTC (permalink / raw)
To: u-boot
On Wed, Mar 16, 2016 at 09:40:57PM -0600, Stephen Warren wrote:
> Fixes:
> arch/arm/mach-bcm283x/mbox.c: In function ?bcm2835_mbox_call_prop?:
> arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160327/88966add/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-03-27 22:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-17 3:40 [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Stephen Warren
2016-03-17 3:40 ` [U-Boot] [PATCH 2/2] ARM: bcm2835: fix 64-bit build warning in mbox Stephen Warren
2016-03-17 15:54 ` Tom Rini
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
2016-03-17 15:54 ` [U-Boot] [PATCH 1/2] ARM: bcm283x: don't always define CONFIG_BCM2835 Tom Rini
2016-03-17 17:35 ` Stephen Warren
2016-03-17 18:08 ` Tom Rini
2016-03-27 22:25 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.