[PATCH 0/5] ARM omap: Some fixes and enhancements

[PATCH 0/5] ARM omap: Some fixes and enhancements

[Sanjeev Premi]

First two patches in this series are fixes to problems in the
existing code.

Next two patches enable specific features on the OMAP3EVM.

The last patch is an enhancement to avoid manual copy each
time barebox is built as the primary bootloader i.e. in the
xload configuration.

Sanjeev Premi (5):
  ARM omap: Use updated config option
  ARM omap3beagle: Fix incorrect base addresses
  ARM omap3evm: Allow building first stage bootloader
  ARM omap3evm: Enable HSMMC device
  ARM omap: Set IFT target as MLO

 arch/arm/Makefile                       |    5 +++--
 arch/arm/boards/omap/board-beagle.c     |   10 +++++-----
 arch/arm/boards/omap/board-omap3evm.c   |    7 ++++++-
 arch/arm/boards/omap/board-sdp343x.c    |    2 +-
 arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 +-
 arch/arm/mach-omap/Kconfig              |    1 +
 6 files changed, 17 insertions(+), 10 deletions(-)


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/5] ARM omap: Use updated config option

[Sanjeev Premi]

The config option CONFIG_GPMC is renamed to
CONFIG_OMAP_GPMC as result of this commit:
  819f416b86b0d4ad3b6e1ec6375a626aabb96bbd

Still, sources continue to use CONFIG_GPMC.
Fix it.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---

 Did basic boot testing on OMAP3EVM after this
 change.


 arch/arm/boards/omap/board-beagle.c     |    2 +-
 arch/arm/boards/omap/board-omap3evm.c   |    2 +-
 arch/arm/boards/omap/board-sdp343x.c    |    2 +-
 arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index e5f0f94..5f8c2df 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -298,7 +298,7 @@ static int beagle_devices_init(void)
 		add_usb_ehci_device(-1, 0x48064700 + 0x100,
 				    0x48064700 + 0x110, &ehci_pdata);
 #endif /* CONFIG_USB_EHCI_OMAP */
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
 #endif
diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c
index d2f041a..9e96bc8 100644
--- a/arch/arm/boards/omap/board-omap3evm.c
+++ b/arch/arm/boards/omap/board-omap3evm.c
@@ -246,7 +246,7 @@ mem_initcall(omap3evm_mem_init);

 static int omap3evm_init_devices(void)
 {
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/*
 	 * WP is made high and WAIT1 active Low
 	 */
diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c
index d486c20..73aefb2 100644
--- a/arch/arm/boards/omap/board-sdp343x.c
+++ b/arch/arm/boards/omap/board-sdp343x.c
@@ -635,7 +635,7 @@ mem_initcall(sdp3430_mem_init);

 static int sdp3430_devices_init(void)
 {
-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
 #endif
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
index 6fe27b7..7b127f3 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
@@ -286,7 +286,7 @@ static void pcaal1_setup_net_chip(void)
 static int pcaal1_mem_init(void)
 {

-#ifdef CONFIG_GPMC
+#ifdef CONFIG_OMAP_GPMC
 	/*
 	 * WP is made high and WAIT1 active Low
 	 */
--
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] ARM omap3beagle: Fix incorrect base addresses

[Sanjeev Premi]

The base address passed for device "omap-hsmmc" was
incorrectly passed as OMAP_I2C1_BASE and the base
address for device "i2c-omap" was hardcoded to
0x4809C000 which, in fact, refers to OMAP_MMC1_BASE.

Similarly, in call to add_usb_ehci_device(), addition
is not required if right base address is used.
In fact, 0x48064700 (used as base in the addition)
falls in the OHCI Address space.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---

 Changes are straight forward address replacement.
 Still, plan to test later today.


 arch/arm/boards/omap/board-beagle.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index 5f8c2df..9f0acad 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -290,13 +290,13 @@ mem_initcall(beagle_mem_init);
 static int beagle_devices_init(void)
 {
 	i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
-	add_generic_device("i2c-omap", -1, NULL, 0x4809C000, SZ_4K,
+	add_generic_device("i2c-omap", -1, NULL, OMAP_I2C1_BASE, SZ_4K,
 			   IORESOURCE_MEM, NULL);
 
 #ifdef CONFIG_USB_EHCI_OMAP
 	if (ehci_omap_init(&omap_ehci_pdata) >= 0)
-		add_usb_ehci_device(-1, 0x48064700 + 0x100,
-				    0x48064700 + 0x110, &ehci_pdata);
+		add_usb_ehci_device(-1, OMAP_EHCI_BASE,
+				    OMAP_EHCI_BASE + 0x10, &ehci_pdata);
 #endif /* CONFIG_USB_EHCI_OMAP */
 #ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
@@ -304,7 +304,7 @@ static int beagle_devices_init(void)
 #endif
 	gpmc_generic_nand_devices_init(0, 16, OMAP_ECC_HAMMING_CODE_HW_ROMCODE);
 
-	add_generic_device("omap-hsmmc", -1, NULL, OMAP_I2C1_BASE, 0,
+	add_generic_device("omap-hsmmc", -1, NULL, OMAP_MMC1_BASE, SZ_4K,
 			   IORESOURCE_MEM, NULL);
 
 	armlinux_set_bootparams((void *)0x80000100);
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] ARM omap3evm: Allow building first stage bootloader

[Sanjeev Premi]

Enable the flag HAVE_NOSHELL to allow first stage
bootloader to be built for this board.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---
 Tested after creating minimal configuration based on
 omap3530_beagle_xload_defconfig.


 arch/arm/mach-omap/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index 73125a7..72c6850 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -133,6 +133,7 @@ config MACH_OMAP3EVM
 	bool "Texas Instrument's OMAP3 EVM"
 	select MACH_HAS_LOWLEVEL_INIT
 	select OMAP_CLOCK_ALL
+	select HAVE_NOSHELL
 	select HAS_OMAP_NAND
 	depends on ARCH_OMAP3
 	  help
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] ARM omap3evm: Enable HSMMC device

[Sanjeev Premi]

Enable the HSMMC device to fix these errors:

   Board: Texas Instrument's OMAP3EVM
   Malloc space: 0x87bfff10 -> 0x87ffff0f (size  4 MB)
   Stack space : 0x87bf7f10 -> 0x87bfff10 (size 32 kB)
   booting from MMC1
   mounting sd card failed with -22
   booting failed

Signed-off-by: Sanjeev Premi <premi@ti.com>
---

 Did basic boot testing on OMAP3EVM after this
 change.


 arch/arm/boards/omap/board-omap3evm.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c
index 9e96bc8..9e292d2 100644
--- a/arch/arm/boards/omap/board-omap3evm.c
+++ b/arch/arm/boards/omap/board-omap3evm.c
@@ -49,6 +49,7 @@
 #include <init.h>
 #include <driver.h>
 #include <io.h>
+#include <sizes.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <mach/silicon.h>
@@ -252,6 +253,10 @@ static int omap3evm_init_devices(void)
 	 */
 	gpmc_generic_init(0x10);
 #endif
+#ifdef CONFIG_MCI_OMAP_HSMMC
+	add_generic_device("omap-hsmmc", -1, NULL, OMAP_MMC1_BASE, SZ_4K,
+				IORESOURCE_MEM, NULL);
+#endif
 	return 0;
 }
 device_initcall(omap3evm_init_devices);
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] ARM omap: Set IFT target as MLO

[Sanjeev Premi]

When CONFIG_OMAP_BUILD_IFT is selected, the
target image name was set to "barebox.bin.ift".
This file must be renamed "MLO" before it can
be used on the SD card.

Make this as default behavior.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---

 Did basic boot testing on OMAP3EVM after this
 change.

 arch/arm/Makefile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 9885634..a994ce2 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -147,12 +147,13 @@ ifeq ($(machine-y),netx)
 KBUILD_IMAGE := barebox.netx
 endif
 
-barebox.bin.ift: barebox.bin
+MLO: barebox.bin
 	@echo "  IFT    " $@
 	$(Q)scripts/omap_signGP barebox.bin $(TEXT_BASE) 1
+	$(Q)test -e barebox.bin.ift && mv barebox.bin.ift MLO
 
 ifeq ($(CONFIG_OMAP_BUILD_IFT),y)
-KBUILD_IMAGE := barebox.bin.ift
+KBUILD_IMAGE := MLO
 endif
 
 all: $(KBUILD_IMAGE)
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

RE: [PATCH 0/5] ARM omap: Some fixes and enhancements

[Premi, Sanjeev]

> -----Original Message-----
> From: Premi, Sanjeev 
> Sent: Wednesday, January 11, 2012 8:27 PM
> To: barebox@lists.infradead.org
> Cc: Premi, Sanjeev
> Subject: [PATCH 0/5] ARM omap: Some fixes and enhancements
> 

It appears that something went wrong in my script for
sending patches and "cc:" list was stripped.

Specifically adding cc: here for review of these patches.

~sanjeev

> First two patches in this series are fixes to problems in the
> existing code.
> 
> Next two patches enable specific features on the OMAP3EVM.
> 
> The last patch is an enhancement to avoid manual copy each
> time barebox is built as the primary bootloader i.e. in the
> xload configuration.
> 
> Sanjeev Premi (5):
>   ARM omap: Use updated config option
>   ARM omap3beagle: Fix incorrect base addresses
>   ARM omap3evm: Allow building first stage bootloader
>   ARM omap3evm: Enable HSMMC device
>   ARM omap: Set IFT target as MLO
> 
>  arch/arm/Makefile                       |    5 +++--
>  arch/arm/boards/omap/board-beagle.c     |   10 +++++-----
>  arch/arm/boards/omap/board-omap3evm.c   |    7 ++++++-
>  arch/arm/boards/omap/board-sdp343x.c    |    2 +-
>  arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 +-
>  arch/arm/mach-omap/Kconfig              |    1 +
>  6 files changed, 17 insertions(+), 10 deletions(-)
> 
> 
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

RE: [PATCH 0/5] ARM omap: Some fixes and enhancements

[Premi, Sanjeev]

> -----Original Message-----
> From: barebox-bounces@lists.infradead.org 
> [mailto:barebox-bounces@lists.infradead.org] On Behalf Of 
> Premi, Sanjeev
> Sent: Wednesday, January 11, 2012 11:02 PM
> To: barebox@lists.infradead.org
> Cc: J.Kilb@phytec.de
> Subject: RE: [PATCH 0/5] ARM omap: Some fixes and enhancements
> 
> > -----Original Message-----
> > From: Premi, Sanjeev 
> > Sent: Wednesday, January 11, 2012 8:27 PM
> > To: barebox@lists.infradead.org
> > Cc: Premi, Sanjeev
> > Subject: [PATCH 0/5] ARM omap: Some fixes and enhancements
> > 

Not sure where the problem is?

The mail in my "Sent Items" has 3 addresses (quoted below). Of these,
2 addresses got deleted on the way!

[quote]
> -----Original Message-----
> From: Premi, Sanjeev 
> Sent: Wednesday, January 11, 2012 11:02 PM
> To: barebox@lists.infradead.org
> Cc: 's.hauer@pengutronix.de'; 'plagnioj@jcrosoft.com'; 
> 'J.Kilb@phytec.de'
> Subject: RE: [PATCH 0/5] ARM omap: Some fixes and enhancements
> 
[/quote]

~sanjeev

> 
> It appears that something went wrong in my script for
> sending patches and "cc:" list was stripped.
> 
> Specifically adding cc: here for review of these patches.
> 
> ~sanjeev
> 
> > First two patches in this series are fixes to problems in the
> > existing code.
> > 
> > Next two patches enable specific features on the OMAP3EVM.
> > 
> > The last patch is an enhancement to avoid manual copy each
> > time barebox is built as the primary bootloader i.e. in the
> > xload configuration.
> > 
> > Sanjeev Premi (5):
> >   ARM omap: Use updated config option
> >   ARM omap3beagle: Fix incorrect base addresses
> >   ARM omap3evm: Allow building first stage bootloader
> >   ARM omap3evm: Enable HSMMC device
> >   ARM omap: Set IFT target as MLO
> > 
> >  arch/arm/Makefile                       |    5 +++--
> >  arch/arm/boards/omap/board-beagle.c     |   10 +++++-----
> >  arch/arm/boards/omap/board-omap3evm.c   |    7 ++++++-
> >  arch/arm/boards/omap/board-sdp343x.c    |    2 +-
> >  arch/arm/boards/phycard-a-l1/pca-a-l1.c |    2 +-
> >  arch/arm/mach-omap/Kconfig              |    1 +
> >  6 files changed, 17 insertions(+), 10 deletions(-)
> > 
> > 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox