Skip to contentSkip to conversation

Adding support for Linuxstamp II 9260

PATCH New Paul Thomas 3 participants 6 messages Nov 3, 2009 – Nov 4, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

From: Paul Thomas <pthomas@black.(none)>

---
 Makefile                                       |    3 +
 board/linuxstamp/at91sam9260ls/Makefile        |   56 ++++++
 board/linuxstamp/at91sam9260ls/at91sam9260ls.c |  203 +++++++++++++++++++++
 board/linuxstamp/at91sam9260ls/config.mk       |    1 +
 board/linuxstamp/at91sam9260ls/led.c           |   41 +++++
 board/linuxstamp/at91sam9260ls/partition.c     |   40 +++++
 include/configs/at91sam9260ls.h                |  223 ++++++++++++++++++++++++
 7 files changed, 567 insertions(+), 0 deletions(-)
 create mode 100644 board/linuxstamp/at91sam9260ls/Makefile
 create mode 100644 board/linuxstamp/at91sam9260ls/at91sam9260ls.c
 create mode 100644 board/linuxstamp/at91sam9260ls/config.mk
 create mode 100644 board/linuxstamp/at91sam9260ls/led.c
 create mode 100644 board/linuxstamp/at91sam9260ls/partition.c
 create mode 100644 include/configs/at91sam9260ls.h
Makefile +3 -0
index bcb3fe9..d8efa66 100644
@@ -2761,6 +2761,9 @@ at91sam9g20ek_config	:	unconfig
 	fi;
 	@$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
 
+at91sam9260ls_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ls linuxstamp at91 
+
 at91sam9xeek_nandflash_config \
 at91sam9xeek_dataflash_cs0_config \
 at91sam9xeek_dataflash_cs1_config \
board/linuxstamp/at91sam9260ls/Makefile new file +56 -0

56 lines not on this page · raw message

board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +203 -0

203 lines not on this page · raw message

board/linuxstamp/at91sam9260ls/config.mk new file +1 -0
new file mode 100644
index 0000000..9ce161e
@@ -0,0 +1 @@
+TEXT_BASE = 0x21f00000
board/linuxstamp/at91sam9260ls/led.c new file +41 -0

41 lines not on this page · raw message

board/linuxstamp/at91sam9260ls/partition.c new file +40 -0
new file mode 100644
index 0000000..2629c67
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2008
+ * Ulf Samuelsson <[email protected]>
+ *
+ * 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 <config.h>
+#include <asm/hardware.h>
+#include <dataflash.h>
+
+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 */
+	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1}
+};
+
+/*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"},
+	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
+	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
+};
include/configs/at91sam9260ls.h new file +223 -0

223 lines not on this page · raw message

Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

Quoted 1 line · On Tuesday 03 November 2009 16:12:40 Paul Thomas wrote:

From: Paul Thomas <pthomas@black.(none)>

looks like you need to fix your git environment & re-submit this patch -mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091103/54f8f475/attachment.pgp

#2 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

Quoted 6 lines · Mike Frysinger
Quoted 1 line · On Tuesday 03 November 2009 16:12:40 Paul Thomas wrote:

From: Paul Thomas <pthomas@black.(none)>

looks like you need to fix your git environment & re-submit this patch -mike

Mike,

Yeah, I saw it does that in git send-email, but the first prompt "Who should the emails appear to be from?" is correct, and the email in the .gitconfig is correct. I don't know where's it's pulling that info from or why it's different from the prompt. It's very annoying.

thanks,
Paul

#3 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

Quoted 10 lines · On Tuesday 03 November 2009 16:26:17 Paul Thomas wrote:
Quoted 4 lines · Mike Frysinger
Quoted 1 line · On Tuesday 03 November 2009 16:12:40 Paul Thomas wrote:

From: Paul Thomas <pthomas@black.(none)>

looks like you need to fix your git environment & re-submit this patch

Yeah, I saw it does that in git send-email, but the first prompt "Who should the emails appear to be from?" is correct, and the email in the .gitconfig is correct. I don't know where's it's pulling that info from or why it's different from the prompt. It's very annoying.

it's most likely encoded in the patch itself. the git-send-email question only asks about the From: field, not the author aspect.

make sure your ~/.gitconfig is correct and has user.name and user.email set, then amend the patch (assuming it's the last changeset in your branch) by doing:
git commit --amend --author 'Your Name <[email protected]>'

that should reset all the relevant fields
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091103/a366ff88/attachment.pgp

#4 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

In reply to Paul Thomas

Dear Paul Thomas,

please check/fix your mail addresses.

Quoted 1 line · In message <[email protected]> you wrote:

From: Paul Thomas <pthomas@black.(none)>

Signed-off-by line is missing.
Quoted 7 lines
---
 Makefile                                       |    3 +
 board/linuxstamp/at91sam9260ls/Makefile        |   56 ++++++
 board/linuxstamp/at91sam9260ls/at91sam9260ls.c |  203 +++++++++++++++++++++
 board/linuxstamp/at91sam9260ls/config.mk       |    1 +
 board/linuxstamp/at91sam9260ls/led.c           |   41 +++++
 board/linuxstamp/at91sam9260ls/partition.c     |   40 +++++
Quoted 8 lines
 include/configs/at91sam9260ls.h                |  223 ++++++++++++++++++++++++
 7 files changed, 567 insertions(+), 0 deletions(-)
 create mode 100644 board/linuxstamp/at91sam9260ls/Makefile
 create mode 100644 board/linuxstamp/at91sam9260ls/at91sam9260ls.c
 create mode 100644 board/linuxstamp/at91sam9260ls/config.mk
 create mode 100644 board/linuxstamp/at91sam9260ls/led.c
 create mode 100644 board/linuxstamp/at91sam9260ls/partition.c
 create mode 100644 include/configs/at91sam9260ls.h

Entries to MAKEALL an MAINTAINERS are missing.

Makefile at91sam9g20ek_config : unconfig · line 2765

Quoted 10 lines
Makefile +2 -0
index bcb3fe9..d8efa66 100644
@@ -2761,6 +2761,9 @@ at91sam9g20ek_config	:	unconfig
 	fi;
 	@$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
 
+at91sam9260ls_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ls linuxstamp at91 

When the board name is Linuxstamp, and the board directory name is linuxstamp, then the board config file name and make target name should be linuxstamp, too.

Quoted 139 lines
Makefile +0 -0
 at91sam9xeek_nandflash_config \
 at91sam9xeek_dataflash_cs0_config \
 at91sam9xeek_dataflash_cs1_config \
board/linuxstamp/at91sam9260ls/Makefile new file +56 -0
new file mode 100644
index 0000000..2a0ef78
@@ -0,0 +1,56 @@
+#
+# (C) Copyright 2003-2008
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# (C) Copyright 2008
+# Stelian Pop <[email protected]>
+# 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	+= at91sam9260ls.o
+COBJS-y	+= led.o
+COBJS-$(CONFIG_HAS_DATAFLASH) += partition.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
+
+#########################################################################
board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +68 -0
new file mode 100644
index 0000000..a1c4466
@@ -0,0 +1,203 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <[email protected]>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * (C) Copyright 2009
+ * Paul Thomas <[email protected]>
+ * http://opencircuits.com/Linuxstamp_II_9260
+ *
+ * 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/at91sam9260.h>
+#include <asm/arch/at91sam9260_matrix.h>
+#include <asm/arch/at91sam9_smc.h>
+#include <asm/arch/at91_common.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>
+#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
+#include <net.h>
+#endif
+#include <netdev.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* ------------------------------------------------------------------------- */
+/*
+ * Miscelaneous platform dependent initialisations
+ */
+
+#ifdef CONFIG_CMD_NAND
+static void at91sam9260ls_nand_hw_init(void)
+{
+	unsigned long csa;
+
+	/* Enable CS3 */
+	csa = at91_sys_read(AT91_MATRIX_EBICSA);
+	at91_sys_write(AT91_MATRIX_EBICSA,
+		       csa | AT91_MATRIX_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),

board/linuxstamp/at91sam9260ls/at91sam9260ls.c line 78

Quoted 10 lines
board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +10 -0
+		       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));

Argh... AT91 "style" again. we should really clean up all this mess one day...

...

board/linuxstamp/at91sam9260ls/at91sam9260ls.c line 158

Quoted 7 lines
board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +7 -0
+#ifdef CONFIG_AT91SAM9G20EK
+	/* arch number of AT91SAM9260EK-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
+#else
+	/* arch number of AT91SAM9260EK-Board */
+	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;
+#endif

This seems to be wrong. Should this not be something like MACH_TYPE_STAMP9G20 instead?

board/linuxstamp/at91sam9260ls/at91sam9260ls.c line 193

Quoted 11 lines
board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +11 -0
+#ifdef CONFIG_RESET_PHY_R
+void reset_phy(void)
+{
+#ifdef CONFIG_MACB
+	/*
+	 * Initialize ethernet HW addr prior to starting Linux,
+	 * needed for nfsroot
+	 */
+	eth_init(gd->bd);
+#endif
+}

NAK. Please fix your Linux drivers instead. See
http://www.denx.de/wiki/view/DULG/EthernetDoesNotWorkInLinux

include/configs/at91sam9260ls.h

Quoted 5 lines
include/configs/at91sam9260ls.h new file +0 -0
new file mode 100644
index 0000000..ba823ea

see above for choice of file name.

include/configs/at91sam9260ls.h line 41

Quoted 2 lines
include/configs/at91sam9260ls.h new file +2 -0
+#define CONFIG_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
+#define CONFIG_AT91SAM9260EK	1	/* This in needed in places like the macb setup in at91sam9260_devices*/

This is most certainly NOT a AT91SAM9260EK board, right?

include/configs/at91sam9260ls.h line 44

Quoted 2 lines
include/configs/at91sam9260ls.h new file +2 -0
+#define CONFIG_ARCH_CPU_INIT
+#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/

Don't undef what is not defined anyway.

Quoted 4 lines
include/configs/at91sam9260ls.h new file +4 -0
+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
+#define CONFIG_SETUP_MEMORY_TAGS 1
+#define CONFIG_INITRD_TAG	1
+

include/configs/at91sam9260ls.h line 59

Quoted 10 lines
include/configs/at91sam9260ls.h new file +10 -0
+#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

Ditto.

include/configs/at91sam9260ls.h line 86

Quoted 7 lines
include/configs/at91sam9260ls.h new file +7 -0
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_SOURCE

Is there any specific reason for disabling lots of pretty useful commands? Are you so tight on flash memory or RAM?

Quoted 1 line

+#ifdef CONFIG_AT91SAM9G20EK

AT91SAM9G20EK ?

Best regards,

Wolfgang Denk

Signature · 5 lines
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 Puritan is someone who is deathly afraid that  someone,  somewhere,
is having fun.
#5 lore raw

PATCH 1/1 Adding support for Linuxstamp II 9260

Quoted 6 lines
Quoted 6 lines
board/linuxstamp/at91sam9260ls/at91sam9260ls.c new file +6 -0
+#ifdef CONFIG_RESET_PHY_R
+void reset_phy(void)
+{
+#ifdef CONFIG_MACB
+ ? ? /*
+ ? ? ?* Initialize ethernet HW addr prior to starting Linux,
Quoted 9 lines

Review

Quoted 5 lines

+ ? ? ?* needed for nfsroot
+ ? ? ?*/
+ ? ? eth_init(gd->bd);

(quoted diff) +2 -0
+#endif
+}

NAK. Please fix your Linux drivers instead. See
http://www.denx.de/wiki/view/DULG/EthernetDoesNotWorkInLinux

This is just what's in at91sam9260ek. If I comment it out it doesn't even compile. It looks like reset_phy is called from lib_arm/board.c. Is there another 9260 board that does the "right" thing here?

thanks,
Paul