[PATCH 1/4] ARM: OMAP: Pass TEXT_BASE address to mk-am35xx-spi-image

[PATCH 1/4] ARM: OMAP: Pass TEXT_BASE address to mk-am35xx-spi-image

[Teresa Gámez]

Pass the TEXT_BASE to the mk-am35xx-spi-image as the
default address does not fit for AM33xx.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index d80c12c..4eced78 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -160,7 +160,7 @@ KBUILD_IMAGE := barebox.ubl
 endif
 
 quiet_cmd_am35xx_spi_image = SPI-IMG $@
-      cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image $< > $@
+      cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image -a $(TEXT_BASE) $< > $@
 
 barebox.spi: $(KBUILD_BINARY) FORCE
 	$(call if_changed,am35xx_spi_image)
-- 
1.7.0.4


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

[PATCH 2/4] ARM: OMAP: pcm051: Increase console output for MLO

[Teresa Gámez]

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/configs/pcm051_mlo_defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/configs/pcm051_mlo_defconfig b/arch/arm/configs/pcm051_mlo_defconfig
index f97a7c7..ea65979 100644
--- a/arch/arm/configs/pcm051_mlo_defconfig
+++ b/arch/arm/configs/pcm051_mlo_defconfig
@@ -5,7 +5,6 @@ CONFIG_MACH_PCM051=y
 CONFIG_OMAP_UART1=y
 CONFIG_THUMB2_BAREBOX=y
 # CONFIG_CMD_ARM_CPUINFO is not set
-# CONFIG_BANNER is not set
 # CONFIG_MEMINFO is not set
 CONFIG_ENVIRONMENT_VARIABLES=y
 CONFIG_MMU=y
@@ -16,6 +15,7 @@ CONFIG_PROMPT="MLO>"
 CONFIG_SHELL_NONE=y
 # CONFIG_ERRNO_MESSAGES is not set
 # CONFIG_TIMESTAMP is not set
+CONFIG_CONSOLE_SIMPLE=y
 # CONFIG_DEFAULT_ENVIRONMENT is not set
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
-- 
1.7.0.4


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

[PATCH 3/4] ARM: OMAP: pcm051: Update enviroment

[Teresa Gámez]

- Fixed NAND booting
- removed config and added config-board
- Load rootfs from nand when booting from SPI flash
- renamed boot/<options> to use $bootsource as global.boot.default

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/boards/pcm051/env/boot/mmc      |   10 ++++++++++
 arch/arm/boards/pcm051/env/boot/nand     |   10 ++++++++++
 arch/arm/boards/pcm051/env/boot/nand-ubi |   10 ----------
 arch/arm/boards/pcm051/env/boot/sd       |   10 ----------
 arch/arm/boards/pcm051/env/boot/spi      |   11 +++++++++++
 arch/arm/boards/pcm051/env/boot/spi-nor  |   12 ------------
 arch/arm/boards/pcm051/env/config        |   22 ----------------------
 arch/arm/boards/pcm051/env/config-board  |    7 +++++++
 8 files changed, 38 insertions(+), 54 deletions(-)
 create mode 100644 arch/arm/boards/pcm051/env/boot/mmc
 create mode 100644 arch/arm/boards/pcm051/env/boot/nand
 delete mode 100644 arch/arm/boards/pcm051/env/boot/nand-ubi
 delete mode 100644 arch/arm/boards/pcm051/env/boot/sd
 create mode 100644 arch/arm/boards/pcm051/env/boot/spi
 delete mode 100644 arch/arm/boards/pcm051/env/boot/spi-nor
 delete mode 100644 arch/arm/boards/pcm051/env/config
 create mode 100644 arch/arm/boards/pcm051/env/config-board

diff --git a/arch/arm/boards/pcm051/env/boot/mmc b/arch/arm/boards/pcm051/env/boot/mmc
new file mode 100644
index 0000000..93a2357
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/mmc
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	boot-menu-add-entry "$0" "kernel & rootfs on SD card"
+	exit
+fi
+
+global.bootm.image=/boot/uImage
+#global.bootm.oftree=/boot/oftree
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/pcm051/env/boot/nand b/arch/arm/boards/pcm051/env/boot/nand
new file mode 100644
index 0000000..22d657e
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/nand
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	boot-menu-add-entry "$0" "nand (UBI)"
+	exit
+fi
+
+global.bootm.image="/dev/nand0.kernel.bb"
+#global.bootm.oftree="/env/oftree"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs"
diff --git a/arch/arm/boards/pcm051/env/boot/nand-ubi b/arch/arm/boards/pcm051/env/boot/nand-ubi
deleted file mode 100644
index efea518..0000000
--- a/arch/arm/boards/pcm051/env/boot/nand-ubi
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-	boot-menu-add-entry "$0" "nand (UBI)"
-	exit
-fi
-
-global.bootm.image="/dev/nand0.kernel.bb"
-#global.bootm.oftree="/env/oftree"
-bootargs-root-ubi -r root -m nand0.root,2048
diff --git a/arch/arm/boards/pcm051/env/boot/sd b/arch/arm/boards/pcm051/env/boot/sd
deleted file mode 100644
index 93a2357..0000000
--- a/arch/arm/boards/pcm051/env/boot/sd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-	boot-menu-add-entry "$0" "kernel & rootfs on SD card"
-	exit
-fi
-
-global.bootm.image=/boot/uImage
-#global.bootm.oftree=/boot/oftree
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/pcm051/env/boot/spi b/arch/arm/boards/pcm051/env/boot/spi
new file mode 100644
index 0000000..2d10184
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/spi
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+        boot-menu-add-entry "$0" "SPI NOR Flash"
+        exit
+fi
+
+global.bootm.image="/dev/m25p0.kernel"
+
+# Use rootfs form NAND for now as rootfs partition < 4MB
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs"
diff --git a/arch/arm/boards/pcm051/env/boot/spi-nor b/arch/arm/boards/pcm051/env/boot/spi-nor
deleted file mode 100644
index 9273b84..0000000
--- a/arch/arm/boards/pcm051/env/boot/spi-nor
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-        boot-menu-add-entry "$0" "SPI NOR Flash"
-        exit
-fi
-
-global.bootm.image="/dev/m25p0.kernel"
-
-# Use rootfs form SD-Card for now as rootfs partition < 4MB
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
-
diff --git a/arch/arm/boards/pcm051/env/config b/arch/arm/boards/pcm051/env/config
deleted file mode 100644
index dd35ff4..0000000
--- a/arch/arm/boards/pcm051/env/config
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# change network settings in /env/network/eth0
-# change mtd partition settings and automountpoints in /env/init/*
-
-global.hostname=pcm051
-
-# set to false if you do not want to have colors
-global.allow_color=true
-
-# user (used for network filenames)
-global.user=none
-
-# timeout in seconds before the default boot entry is started
-global.autoboot_timeout=3
-
-# default boot entry (one of /env/boot/*)
-global.boot.default=sd
-
-# base bootargs
-global.linux.bootargs.base="console=ttyO0,115200n8"
-
diff --git a/arch/arm/boards/pcm051/env/config-board b/arch/arm/boards/pcm051/env/config-board
new file mode 100644
index 0000000..7f0b2b7
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/config-board
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# board defaults, do not change in running system. Change /env/config
+# instead
+
+global.hostname=pcm051
+global.linux.bootargs.base="console=ttyO0,115200"
-- 
1.7.0.4


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

[PATCH 4/4] ARM: OMAP: pcm051: Create own NAND mux struct

[Teresa Gámez]

NAND_WPN is not used on PCM051 so create own NAND
pin mux struct.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/boards/pcm051/board.c |    2 +-
 arch/arm/boards/pcm051/mux.c   |   23 +++++++++++++++++++++++
 arch/arm/boards/pcm051/mux.h   |    1 +
 3 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/pcm051/board.c
index 1993f34..35a3a25 100644
--- a/arch/arm/boards/pcm051/board.c
+++ b/arch/arm/boards/pcm051/board.c
@@ -162,7 +162,7 @@ static void pcm051_i2c_init(void)
 
 static void pcm051_nand_init(void)
 {
-	am33xx_enable_nand_pin_mux();
+	pcm051_enable_nand_pin_mux();
 
 	gpmc_generic_init(0x12);
 
diff --git a/arch/arm/boards/pcm051/mux.c b/arch/arm/boards/pcm051/mux.c
index 6ef5af1..89b4496 100644
--- a/arch/arm/boards/pcm051/mux.c
+++ b/arch/arm/boards/pcm051/mux.c
@@ -14,6 +14,24 @@ static const struct module_pin_mux mmc0_pin_mux[] = {
 	{-1},
 };
 
+static const struct module_pin_mux nand_pin_mux[] = {
+	{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD0 */
+	{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD1 */
+	{OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD2 */
+	{OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD3 */
+	{OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD4 */
+	{OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD5 */
+	{OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD6 */
+	{OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD7 */
+	{OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* NAND WAIT */
+	{OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)},	/* NAND_CS0 */
+	{OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)},	/* NAND_ADV_ALE */
+	{OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)},	/* NAND_OE */
+	{OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)},	/* NAND_WEN */
+	{OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)},	/* NAND_BE_CLE */
+	{-1},
+};
+
 static const struct module_pin_mux user_led_pin_mux[] = {
 	{OFFSET(gpmc_csn1), MODE(7) | PULLUDEN}, /* USER LED1 */
 	{OFFSET(gpmc_csn2), MODE(7) | PULLUDEN}, /* USER LED2 */
@@ -31,6 +49,11 @@ void pcm051_enable_mmc0_pin_mux(void)
 	configure_module_pin_mux(mmc0_pin_mux);
 }
 
+void pcm051_enable_nand_pin_mux(void)
+{
+	configure_module_pin_mux(nand_pin_mux);
+}
+
 void pcm051_enable_user_led_pin_mux(void)
 {
 	configure_module_pin_mux(user_led_pin_mux);
diff --git a/arch/arm/boards/pcm051/mux.h b/arch/arm/boards/pcm051/mux.h
index 4008376..5cdbe0c 100644
--- a/arch/arm/boards/pcm051/mux.h
+++ b/arch/arm/boards/pcm051/mux.h
@@ -1,3 +1,4 @@
 extern void pcm051_enable_mmc0_pin_mux(void);
+extern void pcm051_enable_nand_pin_mux(void);
 extern void pcm051_enable_user_led_pin_mux(void);
 extern void pcm051_enable_user_btn_pin_mux(void);
-- 
1.7.0.4


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

Re: [PATCH 1/4] ARM: OMAP: Pass TEXT_BASE address to mk-am35xx-spi-image

[Sascha Hauer]

On Tue, Aug 06, 2013 at 11:53:04AM +0200, Teresa Gámez wrote:
> Pass the TEXT_BASE to the mk-am35xx-spi-image as the
> default address does not fit for AM33xx.
> 
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>

Applied this series.

Thanks,
 Sascha

> ---
>  arch/arm/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index d80c12c..4eced78 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -160,7 +160,7 @@ KBUILD_IMAGE := barebox.ubl
>  endif
>  
>  quiet_cmd_am35xx_spi_image = SPI-IMG $@
> -      cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image $< > $@
> +      cmd_am35xx_spi_image = scripts/mk-am35xx-spi-image -a $(TEXT_BASE) $< > $@
>  
>  barebox.spi: $(KBUILD_BINARY) FORCE
>  	$(call if_changed,am35xx_spi_image)
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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