mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/8] fixup! ARM: MXS: Add multiimage support
@ 2014-12-25 17:08 Jan Luebbe
  2014-12-25 17:08 ` [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot Jan Luebbe
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:08 UTC (permalink / raw)
  To: barebox

The MX23 needs a different image config, so use separate files for
MX23/MX28.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/mach-mxs/mxs23img.cfg | 6 ++++++
 arch/arm/mach-mxs/mxs28img.cfg | 8 ++++++++
 arch/arm/mach-mxs/mxsimg.cfg   | 8 --------
 images/Makefile.mxs            | 5 +++--
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/mach-mxs/mxs23img.cfg
 create mode 100644 arch/arm/mach-mxs/mxs28img.cfg
 delete mode 100644 arch/arm/mach-mxs/mxsimg.cfg

diff --git a/arch/arm/mach-mxs/mxs23img.cfg b/arch/arm/mach-mxs/mxs23img.cfg
new file mode 100644
index 0000000..34e8848
--- /dev/null
+++ b/arch/arm/mach-mxs/mxs23img.cfg
@@ -0,0 +1,6 @@
+SECTION 0x0 BOOTABLE
+ TAG LAST
+ LOAD     0x1000     @PREP@
+ CALL     0x1000     0x0
+ LOAD     0x40002000 @BOOTLOADER@
+ CALL     0x40002000 0x0
diff --git a/arch/arm/mach-mxs/mxs28img.cfg b/arch/arm/mach-mxs/mxs28img.cfg
new file mode 100644
index 0000000..0ff2c35
--- /dev/null
+++ b/arch/arm/mach-mxs/mxs28img.cfg
@@ -0,0 +1,8 @@
+SECTION 0x0 BOOTABLE
+ TAG LAST
+ LOAD     0x1000     @PREP@
+ LOAD IVT 0x8000     0x1000
+ CALL HAB 0x8000     0x0
+ LOAD     0x40002000 @BOOTLOADER@
+ LOAD IVT 0x8000     0x40002000
+ CALL HAB 0x8000     0x0
diff --git a/arch/arm/mach-mxs/mxsimg.cfg b/arch/arm/mach-mxs/mxsimg.cfg
deleted file mode 100644
index 0ff2c35..0000000
--- a/arch/arm/mach-mxs/mxsimg.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-SECTION 0x0 BOOTABLE
- TAG LAST
- LOAD     0x1000     @PREP@
- LOAD IVT 0x8000     0x1000
- CALL HAB 0x8000     0x0
- LOAD     0x40002000 @BOOTLOADER@
- LOAD IVT 0x8000     0x40002000
- CALL HAB 0x8000     0x0
diff --git a/images/Makefile.mxs b/images/Makefile.mxs
index 41db9c4..811345c 100644
--- a/images/Makefile.mxs
+++ b/images/Makefile.mxs
@@ -19,11 +19,12 @@ $(obj)/%.mxssd: $(obj)/%
 	$(call if_changed,mxs_sd)
 
 board = $(srctree)/arch/$(ARCH)/boards
-mxscfg = $(srctree)/arch/arm/mach-mxs/mxsimg.cfg
+mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg
+mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg
 
 pblx-$(CONFIG_MACH_TX28) += start_barebox_karo_tx28 prep_start_barebox_karo_tx28
 PREP_start_barebox_karo_tx28.pblx.mxsbs = start_barebox_karo_tx28_prep
-CFG_start_barebox_karo_tx28.mxsbs = $(mxscfg)
+CFG_start_barebox_karo_tx28.mxsbs = $(mxs28cfg)
 FILE_barebox-karo-tx28-bootstream.img = start_barebox_karo_tx28.mxsbs
 image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-bootstream.img
 FILE_barebox-karo-tx28-sd.img = start_barebox_karo_tx28.mxsbs.mxssd
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
@ 2014-12-25 17:08 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 3/8] " Jan Luebbe
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:08 UTC (permalink / raw)
  To: barebox

The current u-boot code only configures vddd once with 1500 mV as the target
and 1000 mV as the brownout trigger.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/mach-mxs/power-init.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-mxs/power-init.c b/arch/arm/mach-mxs/power-init.c
index b4431c4..977c6e4 100644
--- a/arch/arm/mach-mxs/power-init.c
+++ b/arch/arm/mach-mxs/power-init.c
@@ -1178,7 +1178,6 @@ static void __mx23_power_init(int has_battery)
 
 	mxs_power_set_vddx(&mx23_vddio_cfg, 3300, 3150);
 	mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1000);
-	mxs_power_set_vddx(&mxs_vddd_cfg, 1350, 1200);
 	mxs_power_set_vddx(&mxs_vddmem_cfg, 2500, 1700);
 
 	writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
@@ -1236,7 +1235,6 @@ static void __mx28_power_init(int has_battery)
 
 	mxs_power_set_vddx(&mx28_vddio_cfg, 3300, 3150);
 	mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1000);
-	mxs_power_set_vddx(&mxs_vddd_cfg, 1350, 1200);
 
 	writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
 		POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ |
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 3/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
  2014-12-25 17:08 ` [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 4/8] arm: mxs: fix pin voltage register value for EMI Jan Luebbe
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

Some boards need to use a different memory setup. Instead of a weak
funktion like u-boot, we make the register data available to the board
code. Also add some early delay and block reset code.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/mach-mxs/include/mach/init.h |  3 ++
 arch/arm/mach-mxs/mem-init.c          | 91 ++++++++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-mxs/include/mach/init.h b/arch/arm/mach-mxs/include/mach/init.h
index d1ac2e4..1f9d8d4 100644
--- a/arch/arm/mach-mxs/include/mach/init.h
+++ b/arch/arm/mach-mxs/include/mach/init.h
@@ -18,6 +18,9 @@ void mx28_power_init(void);
 void mx28_power_init_battery_input(void);
 void mxs_power_wait_pswitch(void);
 
+extern uint32_t mx28_dram_vals[];
+extern uint32_t mx23_dram_vals[];
+
 void mx23_mem_init(void);
 void mx28_mem_init(void);
 void mxs_mem_setup_cpu_and_hbus(void);
diff --git a/arch/arm/mach-mxs/mem-init.c b/arch/arm/mach-mxs/mem-init.c
index f4328b7..9773f94 100644
--- a/arch/arm/mach-mxs/mem-init.c
+++ b/arch/arm/mach-mxs/mem-init.c
@@ -4,6 +4,8 @@
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
  *
+ * Copyright 2013 Stefan Roese <sr@denx.de>
+ *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
@@ -12,13 +14,80 @@
 #include <io.h>
 #include <mach/imx-regs.h>
 #include <linux/compiler.h>
-#include <stmp-device.h>
 
 #include <mach/init.h>
 #include <mach/regs-power-mx28.h>
-#include <mach/regs-clkctrl-mx28.h>
+#if defined CONFIG_ARCH_IMX23
+# include <mach/regs-clkctrl-mx23.h>
+#endif
+#if defined CONFIG_ARCH_IMX28
+# include <mach/regs-clkctrl-mx28.h>
+#endif
+
+/* 1 second delay should be plenty of time for block reset. */
+#define	RESET_MAX_TIMEOUT	1000000
+
+#define	MXS_BLOCK_SFTRST	(1 << 31)
+#define	MXS_BLOCK_CLKGATE	(1 << 30)
+
+int mxs_early_wait_mask_set(struct mxs_register_32 *reg, uint32_t mask, unsigned
+								int timeout)
+{
+	while (--timeout) {
+		if ((readl(&reg->reg) & mask) == mask)
+			break;
+		mxs_early_delay(1);
+	}
+
+	return !timeout;
+}
+
+int mxs_early_wait_mask_clr(struct mxs_register_32 *reg, uint32_t mask, unsigned
+								int timeout)
+{
+	while (--timeout) {
+		if ((readl(&reg->reg) & mask) == 0)
+			break;
+		mxs_early_delay(1);
+	}
+
+	return !timeout;
+}
+
+int mxs_early_reset_block(struct mxs_register_32 *reg)
+{
+	/* Clear SFTRST */
+	writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
+
+	if (mxs_early_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+		return 1;
 
-static uint32_t mx28_dram_vals[] = {
+	/* Clear CLKGATE */
+	writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
+
+	/* Set SFTRST */
+	writel(MXS_BLOCK_SFTRST, &reg->reg_set);
+
+	/* Wait for CLKGATE being set */
+	if (mxs_early_wait_mask_set(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+		return 1;
+
+	/* Clear SFTRST */
+	writel(MXS_BLOCK_SFTRST, &reg->reg_clr);
+
+	if (mxs_early_wait_mask_clr(reg, MXS_BLOCK_SFTRST, RESET_MAX_TIMEOUT))
+		return 1;
+
+	/* Clear CLKGATE */
+	writel(MXS_BLOCK_CLKGATE, &reg->reg_clr);
+
+	if (mxs_early_wait_mask_clr(reg, MXS_BLOCK_CLKGATE, RESET_MAX_TIMEOUT))
+		return 1;
+
+	return 0;
+}
+
+uint32_t mx28_dram_vals[] = {
 /*
  * i.MX28 DDR2 at 200MHz
  */
@@ -75,7 +144,7 @@ static uint32_t mx28_dram_vals[] = {
 /*
  * i.MX23 DDR at 133MHz
  */
-static uint32_t mx23_dram_vals[] = {
+uint32_t mx23_dram_vals[] = {
 	0x01010001, 0x00010100, 0x01000101, 0x00000001,
 	0x00000101, 0x00000000, 0x00010000, 0x01000001,
 	0x00000000, 0x00000001, 0x07000200, 0x00070202,
@@ -202,9 +271,13 @@ static void mx23_mem_setup_vddmem(void)
 	struct mxs_power_regs *power_regs =
 		(struct mxs_power_regs *)IMX_POWER_BASE;
 
+	/* We must wait before and after disabling the current limiter! */
+	mxs_early_delay(10000);
+
 	clrbits_le32(&power_regs->hw_power_vddmemctrl,
 		POWER_VDDMEMCTRL_ENABLE_ILIMIT);
 
+	mxs_early_delay(10000);
 }
 
 void mx23_mem_init(void)
@@ -221,7 +294,7 @@ void mx23_mem_init(void)
 	 * suffers from memory instability. This thing is mx23 specific and is
 	 * no longer present on mx28.
 	 */
-	stmp_reset_block((struct mxs_register_32 *)IMX_EMI_BASE, 0);
+	mxs_early_reset_block((struct mxs_register_32 *)IMX_EMI_BASE);
 
 	mx23_mem_setup_vddmem();
 
@@ -238,7 +311,13 @@ void mx23_mem_init(void)
 	setbits_le32(IMX_SDRAMC_BASE + 0x20, 1 << 16);
 
 	clrbits_le32(IMX_SDRAMC_BASE + 0x40, 1 << 17);
-	mxs_early_delay(20000);
+
+	/* Wait for EMI_STAT bit DRAM_HALTED */
+	for (;;) {
+		if (!(readl(IMX_EMI_BASE + 0x10) & (1 << 1)))
+			break;
+		mxs_early_delay(1000);
+	}
 
 	/* Adjust EMI port priority. */
 	clrsetbits_le32(0x80020000, 0x1f << 16, 0x2);
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 4/8] arm: mxs: fix pin voltage register value for EMI
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
  2014-12-25 17:08 ` [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot Jan Luebbe
  2014-12-25 17:09 ` [PATCH 3/8] " Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 5/8] ARM: imx233-olinuxino: generate complete bootstream Jan Luebbe
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

The EMI pins are documented in the reference manual as using value 0 for both
1.8V and 2.5V. Value 1 is reserved.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/mach-mxs/include/mach/iomux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mxs/include/mach/iomux.h b/arch/arm/mach-mxs/include/mach/iomux.h
index 4361be5..0091dba 100644
--- a/arch/arm/mach-mxs/include/mach/iomux.h
+++ b/arch/arm/mach-mxs/include/mach/iomux.h
@@ -97,7 +97,7 @@
  * .. PORTF(1, 15). So the PORTF macro is more ugly than necessary.
  */
 # define PORTF(bank,bit)	(BANK((bank) / 2) | BANKPIN((((bank) & 1) << 4) | (bit)) | ERROR((bit) & ~15) | ERROR((bank) & ~7))
-# define VE_2_5V		VOLTAGE(1)
+# define VE_2_5V		VOLTAGE(0)
 # include <mach/iomux-imx23.h>
 #endif
 
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 5/8] ARM: imx233-olinuxino: generate complete bootstream
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
                   ` (2 preceding siblings ...)
  2014-12-25 17:09 ` [PATCH 4/8] arm: mxs: fix pin voltage register value for EMI Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 6/8] ARM: imx233-olinuxino: use LED1 as heartbeat Jan Luebbe
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

- Enable multi-image support to generate bootstream, sd-card and 2nd stage
  images.
- Handle pin-mux in lowlevel.c only.
- Use fine-tuned memory setup from u-boot.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c |  61 --------
 arch/arm/boards/imx233-olinuxino/lowlevel.c        | 170 ++++++++++++++++++++-
 arch/arm/mach-mxs/Kconfig                          |   2 +
 images/Makefile.mxs                                |  10 ++
 4 files changed, 180 insertions(+), 63 deletions(-)

diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index fa95d72..901e713 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -39,60 +39,6 @@ static struct mxs_mci_platform_data mci_pdata = {
 	.f_min = 400000,
 };
 
-static const uint32_t pad_setup[] = {
-	/* debug port */
-	PWM1_DUART_TX | STRENGTH(S4MA),    /* PWM0/DUART_TXD - U_DEBUG PIN 2 */
-	PWM0_DUART_RX | STRENGTH(S4MA),    /* PWM0/DUART_RXD - U_DEBUG PIN 1 */
-
-	/* auart */
-	I2C_SDA_AUART1_RX | STRENGTH(S4MA),
-	I2C_CLK_AUART1_TX | STRENGTH(S4MA),
-
-	/* lcd */
-	LCD_D17 | STRENGTH(S12MA),         /*PIN18/LCD_D17   -   GPIO PIN 3 */
-	LCD_D16 | STRENGTH(S12MA),
-	LCD_D15 | STRENGTH(S12MA),
-	LCD_D14 | STRENGTH(S12MA),
-	LCD_D13 | STRENGTH(S12MA),
-	LCD_D12 | STRENGTH(S12MA),
-	LCD_D11 | STRENGTH(S12MA),
-	LCD_D10 | STRENGTH(S12MA),
-	LCD_D9 | STRENGTH(S12MA),
-	LCD_D8 | STRENGTH(S12MA),
-	LCD_D7 | STRENGTH(S12MA),
-	LCD_D6 | STRENGTH(S12MA),
-	LCD_D5 | STRENGTH(S12MA),
-	LCD_D4 | STRENGTH(S12MA),
-	LCD_D3 | STRENGTH(S12MA),
-	LCD_D2 | STRENGTH(S12MA),            /* PIN3/LCD_D02   - GPIO PIN 31*/
-	LCD_D1 | STRENGTH(S12MA),            /* PIN2/LCD_D01   - GPIO PIN 33*/
-	LCD_D0 | STRENGTH(S12MA),            /* PIN1/LCD_D00   - GPIO PIN 35*/
-	LCD_CS,                              /* PIN26/LCD_CS   - GPIO PIN 20*/
-	LCD_RS,                              /* PIN25/LCD_RS   - GPIO PIN 18*/
-	LCD_WR,                              /* PIN24/LCD_WR   - GPIO PIN 16*/
-	LCD_RESET,                           /* PIN23/LCD_DISP - GPIO PIN 14*/
-	LCD_ENABE | STRENGTH(S12MA),  /* PIN22/LCD_EN/I2C_SCL  - GPIO PIN 12*/
-	LCD_VSYNC | STRENGTH(S12MA), /* PIN21/LCD_HSYNC/I2C_SDA- GPIO PIN 10*/
-	LCD_HSYNC | STRENGTH(S12MA),     /* PIN20/LCD_VSYNC    - GPIO PIN  8*/
-	LCD_DOTCLOCK | STRENGTH(S12MA),  /* PIN19/LCD_DOTCLK   - GPIO PIN  6*/
-
-
-	/* SD card interface */
-	SSP1_DATA0 | PULLUP(1),
-	SSP1_DATA1 | PULLUP(1),
-	SSP1_DATA2 | PULLUP(1),
-	SSP1_DATA3 | PULLUP(1),
-	SSP1_SCK,
-	SSP1_CMD | PULLUP(1),
-	SSP1_DETECT | PULLUP(1),
-
-	/* led */
-	SSP1_DETECT_GPIO | GPIO_OUT | GPIO_VALUE(1),
-
-	/* gpio - USB hub LAN9512-JZX*/
-	GPMI_ALE_GPIO | GPIO_OUT | GPIO_VALUE(1),
-};
-
 static int imx23_olinuxino_mem_init(void)
 {
 	arm_add_mem_device("ram0", IMX_MEMORY_BASE, 64 * 1024 * 1024);
@@ -103,7 +49,6 @@ mem_initcall(imx23_olinuxino_mem_init);
 
 static void olinuxino_init_usb(void)
 {
-
 	imx23_usb_phy_enable();
 
 	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, IMX_USB_BASE, NULL);
@@ -111,12 +56,6 @@ static void olinuxino_init_usb(void)
 
 static int imx23_olinuxino_devices_init(void)
 {
-	int i;
-
-	/* initizalize gpios */
-	for (i = 0; i < ARRAY_SIZE(pad_setup); i++)
-		imx_gpio_mode(pad_setup[i]);
-
 	armlinux_set_architecture(MACH_TYPE_IMX233_OLINUXINO);
 
 	add_generic_device("mxs_mci", DEVICE_ID_DYNAMIC, NULL, IMX_SSP1_BASE,
diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c
index d26562c..a5567b7 100644
--- a/arch/arm/boards/imx233-olinuxino/lowlevel.c
+++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c
@@ -3,9 +3,175 @@
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
+#include <mach/init.h>
+#include <io.h>
+#include <debug_ll.h>
+#include <mach/iomux.h>
 
-void __naked barebox_arm_reset_vector(void)
+ENTRY_FUNCTION(start_barebox_olinuxino_imx23, r0, r1, r2)
 {
-	arm_cpu_lowlevel_init();
 	barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, NULL);
 }
+
+static const uint32_t pad_setup[] = {
+	/* debug port */
+	PWM1_DUART_TX | STRENGTH(S4MA),    /* PWM0/DUART_TXD - U_DEBUG PIN 2 */
+	PWM0_DUART_RX | STRENGTH(S4MA),    /* PWM0/DUART_RXD - U_DEBUG PIN 1 */
+
+	/* SDRAM */
+	EMI_D0 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D1 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D2 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D3 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D4 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D5 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D6 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D7 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D8 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D9 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D10 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D11 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D12 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D13 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D14 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_D15 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_DQM0 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_DQM1 | VE_2_5V | STRENGTH(S12MA) | PULLUP(1),
+	EMI_DQS0 | VE_2_5V | STRENGTH(S12MA),
+	EMI_DQS1 | VE_2_5V | STRENGTH(S12MA),
+
+	EMI_CLK | VE_2_5V | STRENGTH(S12MA),
+	EMI_CLKN | VE_2_5V | STRENGTH(S12MA),
+	EMI_A0 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A1 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A2 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A3 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A4 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A5 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A6 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A7 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A8 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A9 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A10 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A11 | VE_2_5V | STRENGTH(S12MA),
+	EMI_A12 | VE_2_5V | STRENGTH(S12MA),
+	EMI_BA0 | VE_2_5V | STRENGTH(S12MA),
+	EMI_BA1 | VE_2_5V | STRENGTH(S12MA),
+
+	EMI_CASN | VE_2_5V | STRENGTH(S12MA),
+	EMI_CE0N | VE_2_5V | STRENGTH(S12MA),
+	EMI_CE1N | VE_2_5V | STRENGTH(S12MA),
+	EMI_CKE | VE_2_5V | STRENGTH(S12MA),
+	EMI_RASN | VE_2_5V | STRENGTH(S12MA),
+	EMI_WEN | VE_2_5V | STRENGTH(S12MA),
+
+	/* auart */
+	I2C_SDA_AUART1_RX | STRENGTH(S4MA),
+	I2C_CLK_AUART1_TX | STRENGTH(S4MA),
+
+	/* LCD */
+	LCD_D17 | STRENGTH(S12MA),         /*PIN18/LCD_D17   -   GPIO PIN 3 */
+	LCD_D16 | STRENGTH(S12MA),
+	LCD_D15 | STRENGTH(S12MA),
+	LCD_D14 | STRENGTH(S12MA),
+	LCD_D13 | STRENGTH(S12MA),
+	LCD_D12 | STRENGTH(S12MA),
+	LCD_D11 | STRENGTH(S12MA),
+	LCD_D10 | STRENGTH(S12MA),
+	LCD_D9 | STRENGTH(S12MA),
+	LCD_D8 | STRENGTH(S12MA),
+	LCD_D7 | STRENGTH(S12MA),
+	LCD_D6 | STRENGTH(S12MA),
+	LCD_D5 | STRENGTH(S12MA),
+	LCD_D4 | STRENGTH(S12MA),
+	LCD_D3 | STRENGTH(S12MA),
+	LCD_D2 | STRENGTH(S12MA),            /* PIN3/LCD_D02   - GPIO PIN 31*/
+	LCD_D1 | STRENGTH(S12MA),            /* PIN2/LCD_D01   - GPIO PIN 33*/
+	LCD_D0 | STRENGTH(S12MA),            /* PIN1/LCD_D00   - GPIO PIN 35*/
+	LCD_CS,                              /* PIN26/LCD_CS   - GPIO PIN 20*/
+	LCD_RS,                              /* PIN25/LCD_RS   - GPIO PIN 18*/
+	LCD_WR,                              /* PIN24/LCD_WR   - GPIO PIN 16*/
+	LCD_RESET,                           /* PIN23/LCD_DISP - GPIO PIN 14*/
+	LCD_ENABE | STRENGTH(S12MA),  /* PIN22/LCD_EN/I2C_SCL  - GPIO PIN 12*/
+	LCD_VSYNC | STRENGTH(S12MA), /* PIN21/LCD_HSYNC/I2C_SDA- GPIO PIN 10*/
+	LCD_HSYNC | STRENGTH(S12MA),     /* PIN20/LCD_VSYNC    - GPIO PIN  8*/
+	LCD_DOTCLOCK | STRENGTH(S12MA),  /* PIN19/LCD_DOTCLK   - GPIO PIN  6*/
+
+	/* SD card interface */
+	SSP1_DATA0 | PULLUP(1),
+	SSP1_DATA1 | PULLUP(1),
+	SSP1_DATA2 | PULLUP(1),
+	SSP1_DATA3 | PULLUP(1),
+	SSP1_SCK,
+	SSP1_CMD | PULLUP(1),
+	SSP1_DETECT | PULLUP(1),
+
+	/* LED */
+	SSP1_DETECT_GPIO | GPIO_OUT | GPIO_VALUE(1),
+
+	/* GPIO - USB hub LAN9512-JZX*/
+	GPMI_ALE_GPIO | GPIO_OUT | GPIO_VALUE(1),
+};
+
+
+/* Fine-tune the DRAM configuration. */
+void imx23_olinuxino_adjust_memory_params(uint32_t *dram_vals)
+{
+	/* Enable Auto Precharge. */
+	dram_vals[3] |= 1 << 8;
+	/* Enable Fast Writes. */
+	dram_vals[5] |= 1 << 8;
+	/* tEMRS = 3*tCK */
+	dram_vals[10] &= ~(0x3 << 8);
+	dram_vals[10] |= (0x3 << 8);
+	/* CASLAT = 3*tCK */
+	dram_vals[11] &= ~(0x3 << 0);
+	dram_vals[11] |= (0x3 << 0);
+	/* tCKE = 1*tCK */
+	dram_vals[12] &= ~(0x7 << 0);
+	dram_vals[12] |= (0x1 << 0);
+	/* CASLAT_LIN_GATE = 3*tCK , CASLAT_LIN = 3*tCK, tWTR=2*tCK */
+	dram_vals[13] &= ~((0xf << 16) | (0xf << 24) | (0xf << 0));
+	dram_vals[13] |= (0x6 << 16) | (0x6 << 24) | (0x2 << 0);
+	/* tDAL = 6*tCK */
+	dram_vals[15] &= ~(0xf << 16);
+	dram_vals[15] |= (0x6 << 16);
+	/* tREF = 1040*tCK */
+	dram_vals[26] &= ~0xffff;
+	dram_vals[26] |= 0x0410;
+	/* tRAS_MAX = 9334*tCK */
+	dram_vals[32] &= ~0xffff;
+	dram_vals[32] |= 0x2475;
+}
+
+static noinline void imx23_olinuxino_init(void)
+{
+	int i;
+
+	/* initizalize gpios */
+	for (i = 0; i < ARRAY_SIZE(pad_setup); i++)
+		imx_gpio_mode(pad_setup[i]);
+
+	pr_debug("initializing power...\n");
+
+	mx23_power_init();
+
+	pr_debug("initializing SDRAM...\n");
+
+	imx23_olinuxino_adjust_memory_params(mx23_dram_vals);
+	mx23_mem_init();
+
+	pr_debug("DONE\n");
+}
+
+ENTRY_FUNCTION(prep_start_barebox_olinuxino_imx23, r0, r1, r2)
+{
+	void (*back)(unsigned long) = (void *)get_lr();
+
+	relocate_to_current_adr();
+	setup_c();
+
+	imx23_olinuxino_init();
+
+	back(0);
+}
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 6ef055e..4022710 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -45,6 +45,8 @@ config MACH_CHUMBY
 
 config MACH_IMX233_OLINUXINO
 	bool "Olimex.ltd imx223-olinuxino"
+	select HAVE_DEFAULT_ENVIRONMENT_NEW
+	select HAVE_PBL_MULTI_IMAGES
 	help
 	  Say Y here if you are using the imx233-olinuxino
 
diff --git a/images/Makefile.mxs b/images/Makefile.mxs
index 811345c..abff255 100644
--- a/images/Makefile.mxs
+++ b/images/Makefile.mxs
@@ -31,3 +31,13 @@ FILE_barebox-karo-tx28-sd.img = start_barebox_karo_tx28.mxsbs.mxssd
 image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-sd.img
 FILE_barebox-karo-tx28-2nd.img = start_barebox_karo_tx28.pblx
 image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-2nd.img
+
+pblx-$(CONFIG_MACH_IMX233_OLINUXINO) += start_barebox_olinuxino_imx23 prep_start_barebox_olinuxino_imx23
+PREP_start_barebox_olinuxino_imx23.pblx.mxsbs = start_barebox_olinuxino_imx23_prep;
+CFG_start_barebox_olinuxino_imx23.mxsbs = $(mxs23cfg)
+FILE_barebox-olinuxino-imx23-bootstream.img = start_barebox_olinuxino_imx23.mxsbs
+image-$(CONFIG_MACH_IMX233_OLINUXINO) += barebox-olinuxino-imx23-bootstream.img
+FILE_barebox-olinuxino-imx23-sd.img = start_barebox_olinuxino_imx23.mxsbs.mxssd
+image-$(CONFIG_MACH_IMX233_OLINUXINO) += barebox-olinuxino-imx23-sd.img
+FILE_barebox-olinuxino-imx23-2nd.img = start_barebox_olinuxino_imx23.pblx
+image-$(CONFIG_MACH_IMX233_OLINUXINO) += barebox-olinuxino-imx23-2nd.img
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 6/8] ARM: imx233-olinuxino: use LED1 as heartbeat
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
                   ` (3 preceding siblings ...)
  2014-12-25 17:09 ` [PATCH 5/8] ARM: imx233-olinuxino: generate complete bootstream Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 7/8] ARM: imx233-olinuxino: update defaultenv Jan Luebbe
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index 901e713..b87a676 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <init.h>
 #include <gpio.h>
+#include <led.h>
 #include <environment.h>
 #include <envfs.h>
 #include <errno.h>
@@ -54,9 +55,20 @@ static void olinuxino_init_usb(void)
 	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, IMX_USB_BASE, NULL);
 }
 
+static struct gpio_led led1 = {
+	.gpio = 65,
+	.led = {
+		.name = "led1",
+	}
+};
+
 static int imx23_olinuxino_devices_init(void)
 {
 	armlinux_set_architecture(MACH_TYPE_IMX233_OLINUXINO);
+	defaultenv_append_directory(defaultenv_imx233_olinuxino);
+
+	led_gpio_register(&led1);
+	led_set_trigger(LED_TRIGGER_HEARTBEAT, &led1.led);
 
 	add_generic_device("mxs_mci", DEVICE_ID_DYNAMIC, NULL, IMX_SSP1_BASE,
 					0x8000, IORESOURCE_MEM, &mci_pdata);
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 7/8] ARM: imx233-olinuxino: update defaultenv
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
                   ` (4 preceding siblings ...)
  2014-12-25 17:09 ` [PATCH 6/8] ARM: imx233-olinuxino: use LED1 as heartbeat Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2014-12-25 17:09 ` [PATCH 8/8] ARM: imx233-olinuxino: update defconfig Jan Luebbe
  2015-01-05 10:31 ` [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Sascha Hauer
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/boards/imx233-olinuxino/Makefile          |  1 +
 .../defaultenv-imx233-olinuxino/boot/sd            |  6 ++++
 .../defaultenv-imx233-olinuxino/init/automount-sd  |  4 +++
 .../network/eth0-discover                          |  6 ++++
 .../defaultenv-imx233-olinuxino/nv/boot.default    |  1 +
 .../defaultenv-imx233-olinuxino/nv/hostname        |  1 +
 .../nv/linux.bootargs.base                         |  1 +
 arch/arm/boards/imx233-olinuxino/env/bin/boot      | 32 -----------------
 arch/arm/boards/imx233-olinuxino/env/bin/init      | 15 --------
 arch/arm/boards/imx233-olinuxino/env/config        | 40 ----------------------
 .../imx233-olinuxino/env/network/eth0-discover     |  6 ----
 11 files changed, 20 insertions(+), 93 deletions(-)
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/boot/sd
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/init/automount-sd
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/network/eth0-discover
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/boot.default
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/hostname
 create mode 100644 arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/linux.bootargs.base
 delete mode 100644 arch/arm/boards/imx233-olinuxino/env/bin/boot
 delete mode 100644 arch/arm/boards/imx233-olinuxino/env/bin/init
 delete mode 100644 arch/arm/boards/imx233-olinuxino/env/config
 delete mode 100644 arch/arm/boards/imx233-olinuxino/env/network/eth0-discover

diff --git a/arch/arm/boards/imx233-olinuxino/Makefile b/arch/arm/boards/imx233-olinuxino/Makefile
index 644f7e5..987b343 100644
--- a/arch/arm/boards/imx233-olinuxino/Makefile
+++ b/arch/arm/boards/imx233-olinuxino/Makefile
@@ -1,2 +1,3 @@
 obj-y = imx23-olinuxino.o
 lwl-y += lowlevel.o
+bbenv-y += defaultenv-imx233-olinuxino
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/boot/sd b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/boot/sd
new file mode 100644
index 0000000..3ddfb9d
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/boot/sd
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+global.bootm.image=/mnt/sd-boot/linuximage
+global.bootm.oftree=/mnt/sd-boot/imx23-olinuxino.dtb
+#global.bootm.initrd=<path to initrd>
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext4 rw rootwait"
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/init/automount-sd b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/init/automount-sd
new file mode 100644
index 0000000..eb34c9b
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/init/automount-sd
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mkdir -p /mnt/sd-boot
+automount -d /mnt/sd-boot 'detect mci0 && [ -e /dev/disk0.1 ] && mount /dev/disk0.1 /mnt/sd-boot'
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/network/eth0-discover b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/network/eth0-discover
new file mode 100644
index 0000000..76494fe
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/network/eth0-discover
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+#  In OLinuXino board i.MX233 SoC uses LAN9512 (attached to USB) to connect
+#  to an Ethernet LAN.
+
+usb
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/boot.default b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/boot.default
new file mode 100644
index 0000000..e1476cf
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/boot.default
@@ -0,0 +1 @@
+sd
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/hostname b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/hostname
new file mode 100644
index 0000000..e5646ed
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/hostname
@@ -0,0 +1 @@
+olinuxino
diff --git a/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/linux.bootargs.base b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/linux.bootargs.base
new file mode 100644
index 0000000..5b56caf
--- /dev/null
+++ b/arch/arm/boards/imx233-olinuxino/defaultenv-imx233-olinuxino/nv/linux.bootargs.base
@@ -0,0 +1 @@
+console=ttyAMA0,115200
diff --git a/arch/arm/boards/imx233-olinuxino/env/bin/boot b/arch/arm/boards/imx233-olinuxino/env/bin/boot
deleted file mode 100644
index 60dd93f..0000000
--- a/arch/arm/boards/imx233-olinuxino/env/bin/boot
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-. /env/config
-
-if [ x$1 = xdisk ]; then
-	rootfs_loc=disk
-	kernel_loc=disk
-elif [ x$1 = xnet ]; then
-	rootfs_loc=net
-	kernel_loc=net
-fi
-
-if [ x$ip = xdhcp ]; then
-	bootargs="$bootargs ip=dhcp"
-elif [ x$ip = xnone ]; then
-	bootargs="$bootargs ip=none"
-else
-	bootargs="$bootargs ip=$eth0.ipaddr::$eth0.gateway:$eth0.netmask:::"
-fi
-
-if [ x$rootfs_loc = xdisk ]; then
-	bootargs="$bootargs noinitrd rootfstype=$rootfs_type root=/dev/$rootfs_part"
-elif [ x$rootfs_loc = xnet ]; then
-	bootargs="$bootargs root=/dev/nfs nfsroot=$nfsroot,v3,tcp noinitrd"
-elif [ x$rootfs_loc = xinitrd ]; then
-	bootargs="$bootargs root=/dev/ram0 rdinit=/sbin/init"
-fi
-
-
-bootm -o $oftree_loc/imx23-olinuxino.dtb /dev/$kernel_part
-
-echo "Booting failed. Correct setup of 'kernel_part'?"
diff --git a/arch/arm/boards/imx233-olinuxino/env/bin/init b/arch/arm/boards/imx233-olinuxino/env/bin/init
deleted file mode 100644
index 3ed68f7..0000000
--- a/arch/arm/boards/imx233-olinuxino/env/bin/init
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PATH=/env/bin
-export PATH
-
-. /env/config
-
-echo
-echo -n "Hit any key to stop autoboot: "
-timeout -a $autoboot_timeout
-if [ $? != 0 ]; then
-	exit
-fi
-
-boot
diff --git a/arch/arm/boards/imx233-olinuxino/env/config b/arch/arm/boards/imx233-olinuxino/env/config
deleted file mode 100644
index c84014f..0000000
--- a/arch/arm/boards/imx233-olinuxino/env/config
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# use 'dhcp' to do dhcp in barebox and in kernel
-# use 'none' if you want to skip kernel ip autoconfiguration
-ip=none
-
-# or set your networking parameters here (if a USB network adapter is attached)
-#eth0.ipaddr=a.b.c.d
-#eth0.netmask=a.b.c.d
-#eth0.gateway=a.b.c.d
-#eth0.serverip=a.b.c.d
-
-# can be either 'net' or 'disk'
-kernel_loc=disk
-
-# can be either 'net', or 'disk' or 'initrd'
-rootfs_loc=disk
-
-# can be any regular filesystem like ext2, ext3, reiserfs in case of 'rootfs_loc=disk'
-rootfs_type=ext3
-
-# Where is the rootfs in case of 'rootfs_loc=disk'
-rootfs_part=mmcblk0p4
-
-# Where is the rootfs in case of 'rootfs_loc=net'
-nfsroot=FIXME
-
-# Where to get the kernel image in case of 'kernel_loc=disk'
-kernel_part=disk0.2
-
-# Where to get the device tree image in case of 'kernel_loc=disk'
-oftree_loc=env/oftree
-
-# base kernel parameter
-bootargs="console=ttyAMA0,115200 rw rootwait"
-
-autoboot_timeout=2
-
-# set a fancy prompt (if support is compiled in)
-PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m "
diff --git a/arch/arm/boards/imx233-olinuxino/env/network/eth0-discover b/arch/arm/boards/imx233-olinuxino/env/network/eth0-discover
deleted file mode 100644
index 76494fe..0000000
--- a/arch/arm/boards/imx233-olinuxino/env/network/eth0-discover
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-#  In OLinuXino board i.MX233 SoC uses LAN9512 (attached to USB) to connect
-#  to an Ethernet LAN.
-
-usb
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH 8/8] ARM: imx233-olinuxino: update defconfig
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
                   ` (5 preceding siblings ...)
  2014-12-25 17:09 ` [PATCH 7/8] ARM: imx233-olinuxino: update defaultenv Jan Luebbe
@ 2014-12-25 17:09 ` Jan Luebbe
  2015-01-05 10:31 ` [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Sascha Hauer
  7 siblings, 0 replies; 9+ messages in thread
From: Jan Luebbe @ 2014-12-25 17:09 UTC (permalink / raw)
  To: barebox

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/configs/imx233-olinuxino_defconfig | 100 ++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 28 deletions(-)

diff --git a/arch/arm/configs/imx233-olinuxino_defconfig b/arch/arm/configs/imx233-olinuxino_defconfig
index 75b5911..5aed6a9 100644
--- a/arch/arm/configs/imx233-olinuxino_defconfig
+++ b/arch/arm/configs/imx233-olinuxino_defconfig
@@ -1,52 +1,89 @@
 CONFIG_ARCH_MXS=y
 CONFIG_MACH_IMX233_OLINUXINO=y
+CONFIG_MXS_OCOTP=y
 CONFIG_AEABI=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_BROKEN=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_MODULES=y
-CONFIG_LONGHELP=y
+CONFIG_ARM_UNWIND=y
+CONFIG_MMU=y
+CONFIG_TEXT_BASE=0x0
+CONFIG_MALLOC_SIZE=0x1000000
+CONFIG_MALLOC_TLSF=y
+CONFIG_KALLSYMS=y
+CONFIG_RELOCATABLE=y
+CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
+CONFIG_BLSPEC=y
+CONFIG_DEFAULT_COMPRESSION_LZO=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/imx233-olinuxino/env"
-CONFIG_BAREBOXENV_TARGET=y
+CONFIG_RESET_SOURCE=y
 CONFIG_DEBUG_INFO=y
-CONFIG_ENABLE_FLASH_NOISE=y
-CONFIG_ENABLE_PARTITION_NOISE=y
-CONFIG_ENABLE_DEVICE_NOISE=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_MTEST=y
-CONFIG_CMD_MTEST_ALTERNATIVE=y
+CONFIG_CMD_DMESG=y
+CONFIG_LONGHELP=y
+CONFIG_CMD_IOMEM=y
+CONFIG_CMD_IMD=y
+CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_BOOTM_SHOW_TYPE=y
 CONFIG_CMD_BOOTM_VERBOSE=y
 CONFIG_CMD_BOOTM_INITRD=y
 CONFIG_CMD_BOOTM_OFTREE=y
 CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_BOOTU is not set
+CONFIG_CMD_GO=y
 CONFIG_CMD_RESET=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_PARTITION=y
-CONFIG_NET=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_DEFAULTENV=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_MAGICVAR_HELP=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_CMP=y
+CONFIG_CMD_FILETYPE=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_SHA1SUM=y
+CONFIG_CMD_SHA224SUM=y
+CONFIG_CMD_SHA256SUM=y
+CONFIG_CMD_UNCOMPRESS=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_READF=y
+CONFIG_CMD_SLEEP=y
 CONFIG_CMD_DHCP=y
-CONFIG_NET_NFS=y
+CONFIG_CMD_HOST=y
 CONFIG_CMD_PING=y
-CONFIG_NET_TFTP=y
-CONFIG_NET_TFTP_PUSH=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_MENUTREE=y
+CONFIG_CMD_SPLASH=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DETECT=y
+CONFIG_CMD_FLASH=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_2048=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
+CONFIG_NET=y
+CONFIG_NET_NFS=y
 CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_RESOLV=y
+CONFIG_DRIVER_SERIAL_AUART=y
 CONFIG_NET_USB=y
 CONFIG_NET_USB_SMSC95XX=y
-CONFIG_DISK_INTF_PLATFORM_IDE=y
+# CONFIG_SPI is not set
 CONFIG_USB_HOST=y
 CONFIG_USB_EHCI=y
 CONFIG_USB_STORAGE=y
@@ -56,8 +93,15 @@ CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_MXS=y
 CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_LED_TRIGGERS=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_MXS_APBH_DMA=y
+CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
+CONFIG_FS_FAT_WRITE=y
+CONFIG_FS_FAT_LFN=y
+CONFIG_ZLIB=y
+CONFIG_LZO_DECOMPRESS=y
-- 
2.1.4


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

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH 1/8] fixup! ARM: MXS: Add multiimage support
  2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
                   ` (6 preceding siblings ...)
  2014-12-25 17:09 ` [PATCH 8/8] ARM: imx233-olinuxino: update defconfig Jan Luebbe
@ 2015-01-05 10:31 ` Sascha Hauer
  7 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2015-01-05 10:31 UTC (permalink / raw)
  To: Jan Luebbe; +Cc: barebox

On Thu, Dec 25, 2014 at 06:08:58PM +0100, Jan Luebbe wrote:
> The MX23 needs a different image config, so use separate files for
> MX23/MX28.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied all, thanks

Sascha


-- 
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

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-01-05 10:32 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-25 17:08 [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Jan Luebbe
2014-12-25 17:08 ` [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot Jan Luebbe
2014-12-25 17:09 ` [PATCH 3/8] " Jan Luebbe
2014-12-25 17:09 ` [PATCH 4/8] arm: mxs: fix pin voltage register value for EMI Jan Luebbe
2014-12-25 17:09 ` [PATCH 5/8] ARM: imx233-olinuxino: generate complete bootstream Jan Luebbe
2014-12-25 17:09 ` [PATCH 6/8] ARM: imx233-olinuxino: use LED1 as heartbeat Jan Luebbe
2014-12-25 17:09 ` [PATCH 7/8] ARM: imx233-olinuxino: update defaultenv Jan Luebbe
2014-12-25 17:09 ` [PATCH 8/8] ARM: imx233-olinuxino: update defconfig Jan Luebbe
2015-01-05 10:31 ` [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox