public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support
@ 2009-03-27  9:24 Daniel Gorsulowski
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Daniel Gorsulowski @ 2009-03-27  9:24 UTC (permalink / raw)
  To: u-boot

This patch improves Atmel AT45DB081 dataflash support.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
---
 drivers/mtd/dataflash.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 96cd395..4b768e7 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -199,7 +199,7 @@ void dataflash_print_info (void)
 
 	for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
 		if (dataflash_info[i].id != 0) {
-			printf("DataFlash:");
+			printf("DataFlash: ");
 			switch (dataflash_info[i].id) {
 			case AT45DB021:
 				printf("AT45DB021\n");
@@ -207,11 +207,12 @@ void dataflash_print_info (void)
 			case AT45DB161:
 				printf("AT45DB161\n");
 				break;
-
+			case AT45DB081:
+				printf("AT45DB081\n");
+				break;
 			case AT45DB321:
 				printf("AT45DB321\n");
 				break;
-
 			case AT45DB642:
 				printf("AT45DB642\n");
 				break;
-- 
1.6.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-03-27  9:24 [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Daniel Gorsulowski
@ 2009-03-27  9:24 ` Daniel Gorsulowski
  2009-03-27 19:53   ` Wolfgang Denk
                     ` (2 more replies)
  2009-03-27 20:49 ` [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Wolfgang Denk
  2009-03-27 23:08 ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 3 replies; 9+ messages in thread
From: Daniel Gorsulowski @ 2009-03-27  9:24 UTC (permalink / raw)
  To: u-boot

This patch adds support for MEESC board from esd gmbh.
The MEESC is based on an Atmel AT91SAM9263 SoC.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
---
 MAINTAINERS               |    4 +
 MAKEALL                   |    1 +
 Makefile                  |    3 +
 board/esd/meesc/Makefile  |   54 ++++++
 board/esd/meesc/config.mk |    1 +
 board/esd/meesc/meesc.c   |  400 +++++++++++++++++++++++++++++++++++++++++++++
 include/configs/meesc.h   |  185 +++++++++++++++++++++
 7 files changed, 648 insertions(+), 0 deletions(-)
 create mode 100644 board/esd/meesc/Makefile
 create mode 100644 board/esd/meesc/config.mk
 create mode 100644 board/esd/meesc/meesc.c
 create mode 100644 include/configs/meesc.h

diff --git a/MAINTAINERS b/MAINTAINERS
index ce25c1b..ccfcd2a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -517,6 +517,10 @@ Peter Figuli <peposh@etc.sk>
 
 	wepep250	xscale
 
+Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
+
+	meesc		ARM926EJS (AT91SAM9263 SoC)
+
 Marius Gr?ger <mag@sysgo.de>
 
 	impa7		ARM720T (EP7211)
diff --git a/MAKEALL b/MAKEALL
index aa7095e..f9e34c6 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -578,6 +578,7 @@ LIST_at91="		\
 	cmc_pu2		\
 	csb637		\
 	kb9202		\
+	meesc		\
 	mp2usb		\
 	m501sk		\
 "
diff --git a/Makefile b/Makefile
index 1cce381..a18cc66 100644
--- a/Makefile
+++ b/Makefile
@@ -2739,6 +2739,9 @@ at91sam9rlek_config	:	unconfig
 	fi;
 	@$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
 
+meesc_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config	\
diff --git a/board/esd/meesc/Makefile b/board/esd/meesc/Makefile
new file mode 100644
index 0000000..6187174
--- /dev/null
+++ b/board/esd/meesc/Makefile
@@ -0,0 +1,54 @@
+#
+# (C) Copyright 2003-2008
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# (C) Copyright 2008
+# Stelian Pop <stelian.pop@leadtechdesign.com>
+# Lead Tech Design <www.leadtechdesign.com>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).a
+
+COBJS-y += meesc.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak $(obj).depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/esd/meesc/config.mk b/board/esd/meesc/config.mk
new file mode 100644
index 0000000..9ce161e
--- /dev/null
+++ b/board/esd/meesc/config.mk
@@ -0,0 +1 @@
+TEXT_BASE = 0x21f00000
diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
new file mode 100644
index 0000000..122707a
--- /dev/null
+++ b/board/esd/meesc/meesc.c
@@ -0,0 +1,400 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * (C) Copyright 2008
+ * Ulf Samuelsson <ulf@atmel.com>
+ *
+ * (C) Copyright 2009
+ * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
+ * esd electronic system design gmbh <www.esd.eu>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/arch/at91sam9263.h>
+#include <asm/arch/at91sam9263_matrix.h>
+#include <asm/arch/at91sam9_smc.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_rstc.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
+#include <asm/arch/hardware.h>
+#include <nand.h>
+#include <dataflash.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Miscelaneous platform dependent initialisations
+ */
+
+static void meesc_serial_hw_init(void)
+{
+	/* initialize DBGU pins*/
+	at91_set_A_periph(AT91_PIN_PC30, 0);		/* DRXD */
+	at91_set_A_periph(AT91_PIN_PC31, 1);		/* DTXD */
+	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS);
+}
+
+#define LED1A	AT91_PIN_PB8
+#define LED1B	AT91_PIN_PB7
+static void meesc_gpio_hw_init(void)
+{
+	/* Peripheral Clock Enable Register */
+	at91_sys_write(AT91_PMC_PCER,	1 << AT91SAM9263_ID_PIOA |
+					1 << AT91SAM9263_ID_PIOB |
+					1 << AT91SAM9263_ID_PIOCDE);
+
+	/* defines ports as output */
+	at91_set_gpio_output(LED1A, 0);
+	at91_set_gpio_output(LED1B, 0);
+}
+
+#ifdef CONFIG_CMD_NAND
+static void meesc_nand_hw_init(void)
+{
+	unsigned long csa;
+
+	/* Enable CS3 */
+	csa = at91_sys_read(AT91_MATRIX_EBI0CSA);
+	at91_sys_write(AT91_MATRIX_EBI0CSA,
+		csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
+
+	/* Configure SMC CS3 for NAND/SmartMedia */
+	at91_sys_write(AT91_SMC_SETUP(3),
+		AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
+		AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));
+	at91_sys_write(AT91_SMC_PULSE(3),
+		AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
+		AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));
+	at91_sys_write(AT91_SMC_CYCLE(3),
+		AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));
+	at91_sys_write(AT91_SMC_MODE(3),
+		AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
+		AT91_SMC_EXNWMODE_DISABLE |
+#ifdef CONFIG_SYS_NAND_DBW_16
+		AT91_SMC_DBW_16 |
+#else /* CONFIG_SYS_NAND_DBW_8 */
+		AT91_SMC_DBW_8 |
+#endif
+		AT91_SMC_TDF_(2));
+
+	/* Configure RDY/BSY */
+	at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
+
+	/* Enable NandFlash */
+	at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
+}
+#endif /* CONFIG_CMD_NAND */
+
+static void meesc_ethercat_hw_init(void)
+{
+	/* Configure SMC EBI1_CS0 for EtherCAT */
+	at91_sys_write(AT91_SMC1_SETUP(0),
+		AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) |
+		AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
+	at91_sys_write(AT91_SMC1_PULSE(0),
+		AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(9) |
+		AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(9));
+	at91_sys_write(AT91_SMC1_CYCLE(0),
+		AT91_SMC_NWECYCLE_(10) | AT91_SMC_NRDCYCLE_(5));
+	/* Configure behavior@external wait signal, byte-select mode, 16 bit
+	data bus width, none data float wait states and TDF optimization */
+		at91_sys_write(AT91_SMC1_MODE(0),
+			AT91_SMC_READMODE |
+			AT91_SMC_EXNWMODE_READY |
+			AT91_SMC_BAT_SELECT |
+			AT91_SMC_DBW_16 |
+			AT91_SMC_TDF_(0) |
+			AT91_SMC_TDFMODE);
+
+	/* Configure RDY/BSY */
+	at91_set_B_periph(AT91_PIN_PE20, 0);	/* EBI1_NWAIT */
+}
+
+#ifdef CONFIG_HAS_DATAFLASH
+AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
+
+struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
+	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
+};
+
+/*define the area offsets*/
+dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
+	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
+};
+
+static void meesc_spi_hw_init(void)
+{
+	at91_set_B_periph(AT91_PIN_PA5, 0);	/* SPI0_NPCS0 */
+	at91_set_B_periph(AT91_PIN_PA0, 0);	/* SPI0_MISO */
+	at91_set_B_periph(AT91_PIN_PA1, 0);	/* SPI0_MOSI */
+	at91_set_B_periph(AT91_PIN_PA2, 0);	/* SPI0_SPCK */
+
+	/* Enable clock */
+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_SPI0);
+}
+#endif /* CONFIG_HAS_DATAFLASH */
+
+#ifdef CONFIG_MACB
+static void meesc_macb_hw_init(void)
+{
+	/* Enable clock */
+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_EMAC);
+
+	/*
+	 * Disable pull-up on:
+	 *	RXDV (PC25) => PHY normal mode (not Test mode)
+	 *	ERX0 (PE25) => PHY ADDR0
+	 *	ERX1 (PE26) => PHY ADDR1 => PHYADDR = 0x0
+	 *
+	 * PHY has internal pull-down
+	 */
+	writel(pin_to_mask(AT91_PIN_PC25),
+		pin_to_controller(AT91_PIN_PC0) + PIO_PUDR);
+	writel(pin_to_mask(AT91_PIN_PE25) |
+		pin_to_mask(AT91_PIN_PE26),
+		pin_to_controller(AT91_PIN_PE0) + PIO_PUDR);
+
+	/* Need to reset PHY -> 500ms reset */
+	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
+				(AT91_RSTC_ERSTL & (0x0D << 8)) |
+				AT91_RSTC_URSTEN);
+
+	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST);
+
+	/* Wait for end hardware reset */
+	while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL));
+
+	/* Restore NRST value */
+	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
+				(AT91_RSTC_ERSTL & (0x0 << 8)) |
+				AT91_RSTC_URSTEN);
+
+	/* Re-enable pull-up */
+	writel(pin_to_mask(AT91_PIN_PC25),
+		pin_to_controller(AT91_PIN_PC0) + PIO_PUER);
+	writel(pin_to_mask(AT91_PIN_PE25) |
+		pin_to_mask(AT91_PIN_PE26),
+		pin_to_controller(AT91_PIN_PE0) + PIO_PUER);
+
+	at91_set_A_periph(AT91_PIN_PE21, 0);	/* ETXCK_EREFCK */
+	at91_set_B_periph(AT91_PIN_PC25, 0);	/* ERXDV */
+	at91_set_A_periph(AT91_PIN_PE25, 0);	/* ERX0 */
+	at91_set_A_periph(AT91_PIN_PE26, 0);	/* ERX1 */
+	at91_set_A_periph(AT91_PIN_PE27, 0);	/* ERXER */
+	at91_set_A_periph(AT91_PIN_PE28, 0);	/* ETXEN */
+	at91_set_A_periph(AT91_PIN_PE23, 0);	/* ETX0 */
+	at91_set_A_periph(AT91_PIN_PE24, 0);	/* ETX1 */
+	at91_set_A_periph(AT91_PIN_PE30, 0);	/* EMDIO */
+	at91_set_A_periph(AT91_PIN_PE29, 0);	/* EMDC */
+
+#ifndef CONFIG_RMII
+	at91_set_A_periph(AT91_PIN_PE22, 0);	/* ECRS */
+	at91_set_B_periph(AT91_PIN_PC26, 0);	/* ECOL */
+	at91_set_B_periph(AT91_PIN_PC22, 0);	/* ERX2 */
+	at91_set_B_periph(AT91_PIN_PC23, 0);	/* ERX3 */
+	at91_set_B_periph(AT91_PIN_PC27, 0);	/* ERXCK */
+	at91_set_B_periph(AT91_PIN_PC20, 0);	/* ETX2 */
+	at91_set_B_periph(AT91_PIN_PC21, 0);	/* ETX3 */
+	at91_set_B_periph(AT91_PIN_PC24, 0);	/* ETXER */
+#endif
+
+}
+#endif
+
+int board_init(void)
+{
+	/* Enable Ctrlc */
+	console_init_f();
+
+	/* arch number of AT91SAM9263EK-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9263EK;
+	/* adress of boot parameters */
+	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
+	meesc_serial_hw_init();
+	meesc_gpio_hw_init();
+#ifdef CONFIG_CMD_NAND
+	meesc_nand_hw_init();
+#endif
+	meesc_ethercat_hw_init();
+#ifdef CONFIG_HAS_DATAFLASH
+	meesc_spi_hw_init();
+#endif
+#ifdef CONFIG_MACB
+	meesc_macb_hw_init();
+#endif
+	return(0);
+}
+
+int dram_init(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM;
+	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+	return(0);
+}
+
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_MACB
+	rc = macb_eth_initialize(0, (void *)AT91SAM9263_BASE_EMAC, 0x00);
+#endif
+	return(rc);
+}
+
+int checkboard(void)
+{
+	char serno[32];
+
+	puts("Board: esd CAN-EtherCAT Gateway\n");
+	if (getenv_r("serial#", serno, sizeof(serno)) > 0) {
+		puts(", serial# ");
+		puts(serno);
+	}
+	printf("Hardware-revision: 1.%d\n", get_hw_rev());
+	return(0);
+}
+
+int get_hw_rev(void)
+{
+	int rev = at91_get_gpio_value(AT91_PIN_PB19);
+	rev |= at91_get_gpio_value(AT91_PIN_PB20) << 1;
+	rev |= at91_get_gpio_value(AT91_PIN_PB21) << 2;
+	rev |= at91_get_gpio_value(AT91_PIN_PB22) << 3;
+
+	if (rev == 15)
+		rev = 0;
+
+	return(rev);
+}
+
+int set_gpio(int argc, char *argv[], unsigned pin)
+{
+	int i = 0;
+	if (argc > 1) {
+		i = argv[1][0] == '1';
+		printf("Setting GPIO-pin to '%d'\n", i);
+		at91_set_gpio_output(pin, i);
+	} else
+		puts("None value given!\n");
+	return(0);
+}
+
+/*
+ * u-boot commands
+ */
+
+/*
+ * LED-functions
+ */
+int do_led_1a(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	return(set_gpio(argc, argv, LED1A));
+}
+U_BOOT_CMD(
+	led_1a,	2,	1,	do_led_1a,
+	"switch LED1A on or off",
+	"\n"
+);
+
+int do_led_1b(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	return(set_gpio(argc, argv, LED1B));
+}
+U_BOOT_CMD(
+	led_1b,	2,	1,	do_led_1b,
+	"switch LED1B on or off",
+	"\n"
+);
+
+/*
+ * USB-cable detect and ET1100 word switching
+ */
+int do_usbstat(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	at91_set_gpio_input(AT91_PIN_PA25, 0);
+	udelay(10000);
+	if (at91_get_gpio_value(AT91_PIN_PA25))
+		puts("USB Cable detected\n");
+	else
+		puts("USB Cable not detected\n");
+	return(0);
+}
+U_BOOT_CMD(
+	usbstat,	2,	1,	do_usbstat,
+	"print status of USB-Device Port",
+	"\n"
+);
+
+int do_wswitch(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	if (get_hw_rev() == 0)
+		return(set_gpio(argc, argv, AT91_PIN_PA25));
+	else {
+		puts("Not a prototype, word-switching not provided!\n");
+		return(0);
+	}
+}
+U_BOOT_CMD(
+	wswitch,	2,	1,	do_wswitch,
+	"select read word on ET1100 (prototypes only)",
+	"\n"
+);
+
+/*
+ * CAN physical layer test
+ */
+int do_cantst(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	unsigned int error = 0;
+	puts("Toggeling Port PA13 (CANTX)... ");
+	/* defines PA13 as output */
+	at91_set_gpio_output(AT91_PIN_PA13, 0);
+	/* defines PA14 as input, internal pullup */
+	at91_set_gpio_input(AT91_PIN_PA14, 1);
+
+	while (!tstc() && !error) {	/* wait for key press or error */
+		at91_set_gpio_value(AT91_PIN_PA13, 1);
+		if (!at91_get_gpio_value(AT91_PIN_PA14))
+			error = 1;
+		at91_set_gpio_value(AT91_PIN_PA13, 0);
+		if (at91_get_gpio_value(AT91_PIN_PA14))
+			error = 1;
+	}
+
+	if (error)
+		puts("CAN error!!\n");
+	else {
+		puts("done\n");
+		getc();			/* consume input */
+	}
+	return(0);
+}
+U_BOOT_CMD(
+	cantst,	2,	1,	do_cantst,
+	"toggles CANTX-Pin",
+	"\n"
+);
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
new file mode 100644
index 0000000..859c4a5
--- /dev/null
+++ b/include/configs/meesc.h
@@ -0,0 +1,185 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * (C) Copyright 2009
+ * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
+ * esd electronic system design gmbh <www.esd.eu>
+ *
+ * Configuation settings for the esd MEESC board.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/* ARM asynchronous clock */
+#define AT91_CPU_NAME		"AT91SAM9263"
+#define AT91_MAIN_CLOCK		16000000	/* 16.0 MHz crystal */
+#define AT91_MASTER_CLOCK	100000000	/* peripheral */
+#define AT91_CPU_CLOCK		200000000	/* cpu */
+#define CONFIG_SYS_AT91_PLLB	0x00023f01	/* PLLB settings for USB */
+#define CONFIG_SYS_HZ		1000		/* decrementer freq */
+
+#define AT91_SLOW_CLOCK		32768		/* slow clock */
+
+#define CONFIG_MEESC			1	/* Board is esd MEESC */
+#define CONFIG_ARM926EJS		1	/* This is an ARM926EJS Core */
+#define CONFIG_AT91SAM9263		1	/* It's an AT91SAM9263 SoC*/
+#undef CONFIG_USE_IRQ				/* don't need IRQ/FIQ stuff */
+#define CONFIG_ENV_OVERWRITE		1	/* necessary on prototypes */
+#define CONFIG_DISPLAY_BOARDINFO	1
+#define CONFIG_PREBOOT				/* enable preboot variable */
+
+#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
+
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT
+
+/*
+ * Hardware drivers
+ */
+#define CONFIG_ATMEL_USART		1
+#undef CONFIG_USART0
+#undef CONFIG_USART1
+#undef CONFIG_USART2
+#define CONFIG_USART3			1	/* USART 3 is DBGU */
+
+#define CONFIG_BOOTDELAY		3
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE	1
+#define CONFIG_BOOTP_BOOTPATH		1
+#define CONFIG_BOOTP_GATEWAY		1
+#define CONFIG_BOOTP_HOSTNAME		1
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_USB
+
+#define CONFIG_CMD_PING			1
+#define CONFIG_CMD_DHCP			1
+#define CONFIG_CMD_NAND			1
+
+/* SDRAM */
+#define CONFIG_NR_DRAM_BANKS		1
+#define PHYS_SDRAM			0x20000000
+#define PHYS_SDRAM_SIZE			0x02000000		/* 32 megs */
+
+/* DataFlash */
+#define CONFIG_HAS_DATAFLASH		1
+#define CONFIG_SYS_SPI_WRITE_TOUT	(5000*CONFIG_SYS_HZ)
+#define CONFIG_SYS_MAX_DATAFLASH_BANKS	1
+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
+#define AT91_SPI_CLK			15000000
+#define DATAFLASH_TCSS			(0x1a << 16)
+#define DATAFLASH_TCHS			(0x1 << 24)
+
+/* NOR flash is not populated, disable it */
+#define CONFIG_SYS_NO_FLASH		1
+
+/* NAND flash */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_NAND_ATMEL
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#define CONFIG_SYS_NAND_BASE		0x40000000
+#define CONFIG_SYS_NAND_DBW_8		1
+/* our ALE is AD21 */
+#define CONFIG_SYS_NAND_MASK_ALE	(1 << 21)
+/* our CLE is AD22 */
+#define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
+#define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD15
+#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PA22
+#endif
+
+/* Ethernet */
+#define CONFIG_MACB			1
+#define CONFIG_RMII			1
+#define CONFIG_NET_MULTI		1
+#define CONFIG_NET_RETRY_COUNT		20
+#undef CONFIG_RESET_PHY_R
+
+#define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
+
+#define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM
+#define CONFIG_SYS_MEMTEST_END		0x21e00000
+
+#define CONFIG_SYS_USE_DATAFLASH		1
+#undef CONFIG_SYS_USE_NANDFLASH
+
+#ifdef CONFIG_SYS_USE_DATAFLASH
+
+/* bootstrap + u-boot + env + linux in dataflash on CS0 */
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_SYS_MONITOR_BASE		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
+					0x8400)
+#define CONFIG_ENV_OFFSET		0x4200
+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + \
+					CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE			0x4200
+#define CONFIG_BOOTCOMMAND		"cp.b C0042000 22000000 210000; bootm"
+
+#else /* CONFIG_SYS_USE_NANDFLASH */
+
+/* bootstrap + u-boot + env + linux in nandflash */
+#define CONFIG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_OFFSET		0x60000
+#define CONFIG_ENV_OFFSET_REDUND	0x80000
+#define CONFIG_ENV_SIZE			0x20000		/* 1 sector = 128 kB */
+#define CONFIG_BOOTCOMMAND		"nand read 22000000 A0000 200000; bootm"
+
+#endif
+
+#define CONFIG_BAUDRATE			115200
+#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
+
+#define CONFIG_SYS_PROMPT		"=> "
+#define CONFIG_SYS_CBSIZE		256
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
+					sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_LONGHELP		1
+#define CONFIG_CMDLINE_EDITING		1
+
+/*
+ * Size of malloc() pool
+ */
+#define CONFIG_SYS_MALLOC_LEN		0x2D000
+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
+
+#define CONFIG_STACKSIZE		(32*1024)	/* regular stack */
+
+#ifdef CONFIG_USE_IRQ
+#error CONFIG_USE_IRQ not supported
+#endif
+
+#endif
-- 
1.6.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
@ 2009-03-27 19:53   ` Wolfgang Denk
  2009-03-29 21:41   ` Jean-Christophe PLAGNIOL-VILLARD
  2009-04-05 11:10   ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-03-27 19:53 UTC (permalink / raw)
  To: u-boot

Dear Daniel Gorsulowski,

In message <1238145854513-git-send-email-Daniel.Gorsulowski@esd.eu> you wrote:
> --===============0533980373==
> 
> This patch adds support for MEESC board from esd gmbh.
> The MEESC is based on an Atmel AT91SAM9263 SoC.
> 
> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
...
> diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
> new file mode 100644
> index 0000000..122707a
> --- /dev/null
> +++ b/board/esd/meesc/meesc.c
...
> +	at91_sys_write(AT91_SMC1_CYCLE(0),
> +		AT91_SMC_NWECYCLE_(10) | AT91_SMC_NRDCYCLE_(5));
> +	/* Configure behavior at external wait signal, byte-select mode, 16 bit
> +	data bus width, none data float wait states and TDF optimization */
> +		at91_sys_write(AT91_SMC1_MODE(0),
> +			AT91_SMC_READMODE |
> +			AT91_SMC_EXNWMODE_READY |
> +			AT91_SMC_BAT_SELECT |
> +			AT91_SMC_DBW_16 |
> +			AT91_SMC_TDF_(0) |
> +			AT91_SMC_TDFMODE);

Indentation wrong.

...
> +int dram_init(void)
> +{
> +	gd->bd->bi_dram[0].start = PHYS_SDRAM;
> +	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
> +	return(0);
> +}

Auto-sizing?

..
> +/*
> + * LED-functions
> + */
> +int do_led_1a(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	return(set_gpio(argc, argv, LED1A));
> +}
> +U_BOOT_CMD(
> +	led_1a,	2,	1,	do_led_1a,
> +	"switch LED1A on or off",
> +	"\n"
> +);
> +
> +int do_led_1b(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	return(set_gpio(argc, argv, LED1B));
> +}
> +U_BOOT_CMD(
> +	led_1b,	2,	1,	do_led_1b,
> +	"switch LED1B on or off",
> +	"\n"
> +);

Do we really, really need new, nonstandard LED commands?


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Either one of us, by himself, is expendable.  Both of us are not.
	-- Kirk, "The Devil in the Dark", stardate 3196.1

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support
  2009-03-27  9:24 [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Daniel Gorsulowski
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
@ 2009-03-27 20:49 ` Wolfgang Denk
  2009-03-27 23:08 ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-03-27 20:49 UTC (permalink / raw)
  To: u-boot

Dear Daniel Gorsulowski,

In message <12381458531295-git-send-email-Daniel.Gorsulowski@esd.eu> you wrote:
> This patch improves Atmel AT45DB081 dataflash support.
> 
> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
> ---
>  drivers/mtd/dataflash.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

"improves" is a bit terse - in which way is it improved? Is it faster,
more reliable, has smaller code, or what?
Please provide a little more description in the committ message.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A witty saying proves nothing, but saying  something  pointless  gets
people's attention.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support
  2009-03-27  9:24 [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Daniel Gorsulowski
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
  2009-03-27 20:49 ` [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Wolfgang Denk
@ 2009-03-27 23:08 ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-03-27 23:08 UTC (permalink / raw)
  To: u-boot

On 10:24 Fri 27 Mar     , Daniel Gorsulowski wrote:
> This patch improves Atmel AT45DB081 dataflash support.
> 
> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
> ---
>  drivers/mtd/dataflash.c |    7 ++++---
>1  1 files changed, 4 insertions(+), 3 deletions(-)
NACK

As precedently announce this driver is now deprecated only bug fix
will be accepted

please take a look on the spi flash framework

Best Regards,
J.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
  2009-03-27 19:53   ` Wolfgang Denk
@ 2009-03-29 21:41   ` Jean-Christophe PLAGNIOL-VILLARD
  2009-04-05 11:10   ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-03-29 21:41 UTC (permalink / raw)
  To: u-boot

> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> +# MA 02111-1307 USA
> +#
> +
> +include $(TOPDIR)/config.mk
> +
> +LIB	= $(obj)lib$(BOARD).a
> +
> +COBJS-y += meesc.o
please use $(BOARD)
> +
> +SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
> +OBJS	:= $(addprefix $(obj),$(COBJS-y))
> +SOBJS	:= $(addprefix $(obj),$(SOBJS))
> +
> +$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
> +	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +
> +clean:
> +	rm -f $(SOBJS) $(OBJS)
> +
> +distclean:	clean
> +	rm -f $(LIB) core *.bak $(obj).depend
> +
> +#########################################################################
> +
> +# defines $(obj).depend target
> +include $(SRCTREE)/rules.mk
> +
> +sinclude $(obj).depend
> +
> +#########################################################################
> diff --git a/board/esd/meesc/config.mk b/board/esd/meesc/config.mk
> new file mode 100644
> index 0000000..9ce161e
> --- /dev/null
> +++ b/board/esd/meesc/config.mk
> @@ -0,0 +1 @@
> +TEXT_BASE = 0x21f00000
> diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
> new file mode 100644
> index 0000000..122707a
> --- /dev/null
> +++ b/board/esd/meesc/meesc.c
> @@ -0,0 +1,400 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * (C) Copyright 2008
> + * Ulf Samuelsson <ulf@atmel.com>
> + *
> + * (C) Copyright 2009
> + * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
> + * esd electronic system design gmbh <www.esd.eu>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include <common.h>
> +#include <asm/arch/at91sam9263.h>
> +#include <asm/arch/at91sam9263_matrix.h>
> +#include <asm/arch/at91sam9_smc.h>
> +#include <asm/arch/at91_pmc.h>
> +#include <asm/arch/at91_rstc.h>
> +#include <asm/arch/gpio.h>
> +#include <asm/arch/io.h>
> +#include <asm/arch/hardware.h>
> +#include <nand.h>
> +#include <dataflash.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/*
> + * Miscelaneous platform dependent initialisations
> + */
> +
> +static void meesc_serial_hw_init(void)
> +{
> +	/* initialize DBGU pins*/
> +	at91_set_A_periph(AT91_PIN_PC30, 0);		/* DRXD */
> +	at91_set_A_periph(AT91_PIN_PC31, 1);		/* DTXD */
> +	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS);
> +}
please use new hw_init framwork
> +
> +#define LED1A	AT91_PIN_PB8
> +#define LED1B	AT91_PIN_PB7
> +static void meesc_gpio_hw_init(void)
> +{
> +	/* Peripheral Clock Enable Register */
> +	at91_sys_write(AT91_PMC_PCER,	1 << AT91SAM9263_ID_PIOA |
> +					1 << AT91SAM9263_ID_PIOB |
> +					1 << AT91SAM9263_ID_PIOCDE);
> +
> +	/* defines ports as output */
> +	at91_set_gpio_output(LED1A, 0);
> +	at91_set_gpio_output(LED1B, 0);
> +}
> +
> +#ifdef CONFIG_CMD_NAND
> +static void meesc_nand_hw_init(void)
> +{
> +	unsigned long csa;
> +
> +	/* Enable CS3 */
> +	csa = at91_sys_read(AT91_MATRIX_EBI0CSA);
> +	at91_sys_write(AT91_MATRIX_EBI0CSA,
> +		csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
> +
> +	/* Configure SMC CS3 for NAND/SmartMedia */
> +	at91_sys_write(AT91_SMC_SETUP(3),
> +		AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
> +		AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));
> +	at91_sys_write(AT91_SMC_PULSE(3),
> +		AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
> +		AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));
> +	at91_sys_write(AT91_SMC_CYCLE(3),
> +		AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));
> +	at91_sys_write(AT91_SMC_MODE(3),
> +		AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> +		AT91_SMC_EXNWMODE_DISABLE |
> +#ifdef CONFIG_SYS_NAND_DBW_16
> +		AT91_SMC_DBW_16 |
> +#else /* CONFIG_SYS_NAND_DBW_8 */
> +		AT91_SMC_DBW_8 |
> +#endif
> +		AT91_SMC_TDF_(2));
> +
> +	/* Configure RDY/BSY */
> +	at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
> +
> +	/* Enable NandFlash */
> +	at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
> +}
> +#endif /* CONFIG_CMD_NAND */
> +
> +static void meesc_ethercat_hw_init(void)
> +{
do you have intention to use it in U-Boot?
> +	/* Configure SMC EBI1_CS0 for EtherCAT */
> +	at91_sys_write(AT91_SMC1_SETUP(0),
> +		AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) |
> +		AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
> +	at91_sys_write(AT91_SMC1_PULSE(0),
> +		AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(9) |
> +		AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(9));
> +	at91_sys_write(AT91_SMC1_CYCLE(0),
> +		AT91_SMC_NWECYCLE_(10) | AT91_SMC_NRDCYCLE_(5));
> +	/* Configure behavior at external wait signal, byte-select mode, 16 bit
> +	data bus width, none data float wait states and TDF optimization */
> +		at91_sys_write(AT91_SMC1_MODE(0),
> +			AT91_SMC_READMODE |
> +			AT91_SMC_EXNWMODE_READY |
> +			AT91_SMC_BAT_SELECT |
> +			AT91_SMC_DBW_16 |
> +			AT91_SMC_TDF_(0) |
> +			AT91_SMC_TDFMODE);
> +
> +	/* Configure RDY/BSY */
> +	at91_set_B_periph(AT91_PIN_PE20, 0);	/* EBI1_NWAIT */
> +}
> +

> +int board_init(void)
> +{
> +	/* Enable Ctrlc */
> +	console_init_f();
> +
> +	/* arch number of AT91SAM9263EK-Board */
> +	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9263EK;
please use your own arch number
> +	/* adress of boot parameters */
> +	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
> +
> +	meesc_serial_hw_init();
> +	meesc_gpio_hw_init();
> +#ifdef CONFIG_CMD_NAND
> +	meesc_nand_hw_init();
> +#endif
> +	meesc_ethercat_hw_init();
> +#ifdef CONFIG_HAS_DATAFLASH
> +	meesc_spi_hw_init();
> +#endif
> +#ifdef CONFIG_MACB
> +	meesc_macb_hw_init();
> +#endif
> +	return(0);
> +}
> +
> +int dram_init(void)
> +{
> +	gd->bd->bi_dram[0].start = PHYS_SDRAM;
> +	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
> +	return(0);
> +}
> +
> +int board_eth_init(bd_t *bis)
> +{
> +	int rc = 0;
> +#ifdef CONFIG_MACB
> +	rc = macb_eth_initialize(0, (void *)AT91SAM9263_BASE_EMAC, 0x00);
> +#endif
> +	return(rc);
> +}
> +
> +int checkboard(void)
> +{
> +	char serno[32];
> +
> +	puts("Board: esd CAN-EtherCAT Gateway\n");
> +	if (getenv_r("serial#", serno, sizeof(serno)) > 0) {
> +		puts(", serial# ");
> +		puts(serno);
> +	}
> +	printf("Hardware-revision: 1.%d\n", get_hw_rev());
> +	return(0);
> +}
> +
> +int get_hw_rev(void)
> +{
> +	int rev = at91_get_gpio_value(AT91_PIN_PB19);
> +	rev |= at91_get_gpio_value(AT91_PIN_PB20) << 1;
> +	rev |= at91_get_gpio_value(AT91_PIN_PB21) << 2;
> +	rev |= at91_get_gpio_value(AT91_PIN_PB22) << 3;
> +
> +	if (rev == 15)
> +		rev = 0;
> +
> +	return(rev);
> +}
> +
> +int set_gpio(int argc, char *argv[], unsigned pin)
> +{
> +	int i = 0;
> +	if (argc > 1) {
> +		i = argv[1][0] == '1';
> +		printf("Setting GPIO-pin to '%d'\n", i);
> +		at91_set_gpio_output(pin, i);
> +	} else
> +		puts("None value given!\n");
> +	return(0);
> +}
> +
> +/*
> + * u-boot commands
> + */
> +
> +/*
> + * LED-functions
> + */
> +int do_led_1a(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	return(set_gpio(argc, argv, LED1A));
> +}
> +U_BOOT_CMD(
> +	led_1a,	2,	1,	do_led_1a,
> +	"switch LED1A on or off",
> +	"\n"
> +);
> +
> +int do_led_1b(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	return(set_gpio(argc, argv, LED1B));
> +}
> +U_BOOT_CMD(
> +	led_1b,	2,	1,	do_led_1b,
> +	"switch LED1B on or off",
> +	"\n"
> +);
Ulf send a patch some weeks ago for this purpose
please take a look on it
Subject: [U-Boot] [PATCH 1/1] ARM: Add command to control coloured led from the console
> +
> +/*
> + * USB-cable detect and ET1100 word switching
> + */
> +int do_usbstat(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	at91_set_gpio_input(AT91_PIN_PA25, 0);
> +	udelay(10000);
> +	if (at91_get_gpio_value(AT91_PIN_PA25))
> +		puts("USB Cable detected\n");
> +	else
> +		puts("USB Cable not detected\n");
> +	return(0);
> +}
> +U_BOOT_CMD(
> +	usbstat,	2,	1,	do_usbstat,
> +	"print status of USB-Device Port",
> +	"\n"
> +);
IMHO it's could be a generic command
> +
> +int do_wswitch(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	if (get_hw_rev() == 0)
> +		return(set_gpio(argc, argv, AT91_PIN_PA25));
> +	else {
> +		puts("Not a prototype, word-switching not provided!\n");
> +		return(0);
> +	}
> +}
> +U_BOOT_CMD(
> +	wswitch,	2,	1,	do_wswitch,
> +	"select read word on ET1100 (prototypes only)",
> +	"\n"
> +);
> +
> +/*
> + * CAN physical layer test
> + */
> +int do_cantst(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
> +{
> +	unsigned int error = 0;
> +	puts("Toggeling Port PA13 (CANTX)... ");
> +	/* defines PA13 as output */
> +	at91_set_gpio_output(AT91_PIN_PA13, 0);
> +	/* defines PA14 as input, internal pullup */
> +	at91_set_gpio_input(AT91_PIN_PA14, 1);
> +
> +	while (!tstc() && !error) {	/* wait for key press or error */
> +		at91_set_gpio_value(AT91_PIN_PA13, 1);
> +		if (!at91_get_gpio_value(AT91_PIN_PA14))
> +			error = 1;
> +		at91_set_gpio_value(AT91_PIN_PA13, 0);
> +		if (at91_get_gpio_value(AT91_PIN_PA14))
> +			error = 1;
> +	}
> +
> +	if (error)
> +		puts("CAN error!!\n");
> +	else {
> +		puts("done\n");
> +		getc();			/* consume input */
> +	}
> +	return(0);
> +}
> +U_BOOT_CMD(
> +	cantst,	2,	1,	do_cantst,
> +	"toggles CANTX-Pin",
> +	"\n"
> +);
could you be more specific about all this new command
and please add a readme
> diff --git a/include/configs/meesc.h b/include/configs/meesc.h
> new file mode 100644
> index 0000000..859c4a5
> --- /dev/null
> +++ b/include/configs/meesc.h
> @@ -0,0 +1,185 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * (C) Copyright 2009
> + * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
> + * esd electronic system design gmbh <www.esd.eu>
> + *
> + * Configuation settings for the esd MEESC board.
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +
> +/* ARM asynchronous clock */
> +#define AT91_CPU_NAME		"AT91SAM9263"
> +#define AT91_MAIN_CLOCK		16000000	/* 16.0 MHz crystal */
> +#define AT91_MASTER_CLOCK	100000000	/* peripheral */
> +#define AT91_CPU_CLOCK		200000000	/* cpu */
> +#define CONFIG_SYS_AT91_PLLB	0x00023f01	/* PLLB settings for USB */
I'm preparing a new patch that will allow us to remove all this clock
hardcoded define please wait one or two days
> +#define CONFIG_SYS_HZ		1000		/* decrementer freq */
> +
> +#define AT91_SLOW_CLOCK		32768		/* slow clock */
> +
> +#define CONFIG_MEESC			1	/* Board is esd MEESC */
> +#define CONFIG_ARM926EJS		1	/* This is an ARM926EJS Core */
> +#define CONFIG_AT91SAM9263		1	/* It's an AT91SAM9263 SoC*/
> +#undef CONFIG_USE_IRQ				/* don't need IRQ/FIQ stuff */
> +#define CONFIG_ENV_OVERWRITE		1	/* necessary on prototypes */
> +#define CONFIG_DISPLAY_BOARDINFO	1
> +#define CONFIG_PREBOOT				/* enable preboot variable */
> +
> +#define CONFIG_CMDLINE_TAG		1	/* enable passing of ATAGs */
> +#define CONFIG_SETUP_MEMORY_TAGS	1
> +#define CONFIG_INITRD_TAG		1
> +
> +#define CONFIG_SKIP_LOWLEVEL_INIT
> +#define CONFIG_SKIP_RELOCATE_UBOOT
> +
> +/*
> + * Hardware drivers
> + */
> +#define CONFIG_ATMEL_USART		1
> +#undef CONFIG_USART0
> +#undef CONFIG_USART1
> +#undef CONFIG_USART2
> +#define CONFIG_USART3			1	/* USART 3 is DBGU */
> +
> +#define CONFIG_BOOTDELAY		3
> +
> +/*
> + * BOOTP options
> + */
> +#define CONFIG_BOOTP_BOOTFILESIZE	1
> +#define CONFIG_BOOTP_BOOTPATH		1
> +#define CONFIG_BOOTP_GATEWAY		1
> +#define CONFIG_BOOTP_HOSTNAME		1
> +
> +/*
> + * Command line configuration.
> + */
> +#include <config_cmd_default.h>
> +#undef CONFIG_CMD_BDI
> +#undef CONFIG_CMD_AUTOSCRIPT
> +#undef CONFIG_CMD_FPGA
> +#undef CONFIG_CMD_LOADS
> +#undef CONFIG_CMD_IMLS
> +#undef CONFIG_CMD_USB
> +
> +#define CONFIG_CMD_PING			1
> +#define CONFIG_CMD_DHCP			1
> +#define CONFIG_CMD_NAND			1
> +
> +/* SDRAM */
> +#define CONFIG_NR_DRAM_BANKS		1
> +#define PHYS_SDRAM			0x20000000
> +#define PHYS_SDRAM_SIZE			0x02000000		/* 32 megs */
> +
> +/* DataFlash */
> +#define CONFIG_HAS_DATAFLASH		1
> +#define CONFIG_SYS_SPI_WRITE_TOUT	(5000*CONFIG_SYS_HZ)
please add space before and after '*'
> +#define CONFIG_SYS_MAX_DATAFLASH_BANKS	1
> +#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
> +#define AT91_SPI_CLK			15000000
> +#define DATAFLASH_TCSS			(0x1a << 16)
> +#define DATAFLASH_TCHS			(0x1 << 24)
> +
> +/* NOR flash is not populated, disable it */
> +#define CONFIG_SYS_NO_FLASH		1

Best Regards,
J.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
  2009-03-27 19:53   ` Wolfgang Denk
  2009-03-29 21:41   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2009-04-05 11:10   ` Jean-Christophe PLAGNIOL-VILLARD
  2009-04-06  7:56     ` Daniel Gorsulowski
  2 siblings, 1 reply; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-05 11:10 UTC (permalink / raw)
  To: u-boot

On 10:24 Fri 27 Mar     , Daniel Gorsulowski wrote:
> This patch adds support for MEESC board from esd gmbh.
> The MEESC is based on an Atmel AT91SAM9263 SoC.
> 
> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
> ---
please rebase your patch against

git://git.denx.de/u-boot-at91.git branch clock

Best Regards,
J.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-04-05 11:10   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2009-04-06  7:56     ` Daniel Gorsulowski
  2009-04-13 22:03       ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 1 reply; 9+ messages in thread
From: Daniel Gorsulowski @ 2009-04-06  7:56 UTC (permalink / raw)
  To: u-boot

Hi Jean-Christophe,

Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:24 Fri 27 Mar     , Daniel Gorsulowski wrote:
>> This patch adds support for MEESC board from esd gmbh.
>> The MEESC is based on an Atmel AT91SAM9263 SoC.
>>
>> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
>> ---
> please rebase your patch against
> 
> git://git.denx.de/u-boot-at91.git branch clock
> 
> Best Regards,
> J.

sorry, but my board does not boot by this branch.
Followed by the bootstrapper-"RomBOOT"-prompt just some cryptical characters
appear. Seems like the cpu clock is not initialized correctly.
The board uses an 16.0 Mhz crystal.
I configured as followed:

/* ARM asynchronous clock */
#define AT91_CPU_NAME		"AT91SAM9263"
#define AT91_MAIN_CLOCK		16000000	/* 16.0 MHz crystal */
#define CONFIG_SYS_HZ		1000		/* decrementer freq */

#define CONFIG_MEESC			1	/* Board is esd MEESC */
#define CONFIG_ARM926EJS		1	/* This is an ARM926EJS Core */
#define CONFIG_AT91SAM9263		1	/* It's an AT91SAM9263 SoC*/
#define CONFIG_ARCH_CPU_INIT		1
...


If I build from git://git.denx.de/u-boot.git branch master after applying
my patches, the board boots up correctly.

Best Regards,
Daniel

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board
  2009-04-06  7:56     ` Daniel Gorsulowski
@ 2009-04-13 22:03       ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-04-13 22:03 UTC (permalink / raw)
  To: u-boot

On 09:56 Mon 06 Apr     , Daniel Gorsulowski wrote:
> Hi Jean-Christophe,
>
> Jean-Christophe PLAGNIOL-VILLARD wrote:
>> On 10:24 Fri 27 Mar     , Daniel Gorsulowski wrote:
>>> This patch adds support for MEESC board from esd gmbh.
>>> The MEESC is based on an Atmel AT91SAM9263 SoC.
>>>
>>> Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
>>> ---
>> please rebase your patch against
>>
>> git://git.denx.de/u-boot-at91.git branch clock
>>
>> Best Regards,
>> J.
>
> sorry, but my board does not boot by this branch.
> Followed by the bootstrapper-"RomBOOT"-prompt just some cryptical characters
> appear. Seems like the cpu clock is not initialized correctly.
this code is not responsible to initialize the cpu clock
it just read and calculate dynamicly the differenct at91 clocks

if this code does not work please not that linux will have the same problem
so please fix you lowlevel_init or your at91bootstrap
> The board uses an 16.0 Mhz crystal.
this crystal can even be detected by cpu without specify it
> I configured as followed:
>
> /* ARM asynchronous clock */
> #define AT91_CPU_NAME		"AT91SAM9263"
> #define AT91_MAIN_CLOCK		16000000	/* 16.0 MHz crystal */
try without this define, by letting the cpu detect it

Best Regards,
J.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2009-04-13 22:03 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-27  9:24 [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Daniel Gorsulowski
2009-03-27  9:24 ` [U-Boot] [PATCH 2/2] at91: Add support for esd MEESC board Daniel Gorsulowski
2009-03-27 19:53   ` Wolfgang Denk
2009-03-29 21:41   ` Jean-Christophe PLAGNIOL-VILLARD
2009-04-05 11:10   ` Jean-Christophe PLAGNIOL-VILLARD
2009-04-06  7:56     ` Daniel Gorsulowski
2009-04-13 22:03       ` Jean-Christophe PLAGNIOL-VILLARD
2009-03-27 20:49 ` [U-Boot] [PATCH 1/2] at91: Improved Atmel AT45DB081 dataflash support Wolfgang Denk
2009-03-27 23:08 ` Jean-Christophe PLAGNIOL-VILLARD

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