[U-Boot] [PATCH] AT91: Added support for taskit Stamp9G20 and PortuxG20

Signed-off-by: Achim Ehrlich aehrlich@taskit.de --- Makefile | 9 ++ board/taskit/stamp9G20/Makefile | 56 ++++++++++ board/taskit/stamp9G20/config.mk | 1 + board/taskit/stamp9G20/led.c | 35 ++++++ board/taskit/stamp9G20/partition.c | 40 +++++++ board/taskit/stamp9G20/stamp9G20.c | 200 ++++++++++++++++++++++++++++++++++++ include/configs/stamp9G20.h | 197 +++++++++++++++++++++++++++++++++++ 7 files changed, 538 insertions(+), 0 deletions(-) create mode 100644 board/taskit/stamp9G20/Makefile create mode 100644 board/taskit/stamp9G20/config.mk create mode 100644 board/taskit/stamp9G20/led.c create mode 100644 board/taskit/stamp9G20/partition.c create mode 100644 board/taskit/stamp9G20/stamp9G20.c create mode 100644 include/configs/stamp9G20.h
diff --git a/Makefile b/Makefile index 524b9da..ef1a7d4 100644 --- a/Makefile +++ b/Makefile @@ -2906,6 +2906,15 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
+portuxG20_config \ +stamp9G20_config : unconfig + @mkdir -p $(obj)include + @if [ "$(findstring portux,$@)" ] ; then \ + echo "#define CONFIG_PORTUXG20 1" >$(obj)include/config.h; \ + $(XECHO) "... PortuxG20";\ + fi; + @$(MKCONFIG) -a stamp9G20 arm arm926ejs stamp9G20 taskit at91 + ######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. integratorap_config \ diff --git a/board/taskit/stamp9G20/Makefile b/board/taskit/stamp9G20/Makefile new file mode 100644 index 0000000..ef82428 --- /dev/null +++ b/board/taskit/stamp9G20/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd@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 += stamp9G20.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 + +######################################################################### diff --git a/board/taskit/stamp9G20/config.mk b/board/taskit/stamp9G20/config.mk new file mode 100644 index 0000000..ff2cfd1 --- /dev/null +++ b/board/taskit/stamp9G20/config.mk @@ -0,0 +1 @@ +TEXT_BASE = 0x23f00000 diff --git a/board/taskit/stamp9G20/led.c b/board/taskit/stamp9G20/led.c new file mode 100644 index 0000000..dc6ac63 --- /dev/null +++ b/board/taskit/stamp9G20/led.c @@ -0,0 +1,35 @@ +/* + * (C) Copyright 2007-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 <common.h> +#include <asm/arch/at91sam9260.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h> + +void coloured_LED_init(void) +{ + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); +} diff --git a/board/taskit/stamp9G20/partition.c b/board/taskit/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/taskit/stamp9G20/partition.c @@ -0,0 +1,40 @@ +/* + * (C) Copyright 2008 + * Ulf Samuelsson ulf@atmel.com + * + * 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"}, +}; diff --git a/board/taskit/stamp9G20/stamp9G20.c b/board/taskit/stamp9G20/stamp9G20.c new file mode 100644 index 0000000..28cd8b1 --- /dev/null +++ b/board/taskit/stamp9G20/stamp9G20.c @@ -0,0 +1,200 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop stelian.pop@leadtechdesign.com + * Lead Tech Design <www.leadtechdesign.com> + * + * Achim Ehrlich aehrlich@taskit.de + * taskit GmbH <www.taskit.de> + * + * 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 stamp9G20_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), + 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)); + + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); + + /* 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 + +#ifdef CONFIG_MACB +static void stamp9G20_macb_hw_init(void) +{ + + /* Enable MACB Chip, this is the enable PIN on Stamp Adaptor*/ + at91_set_gpio_output(AT91_PIN_PA26,0); + + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC); + + /* + * Disable pull-up on: + * RXDV (PA17) => PHY normal mode (not Test mode) + * ERX0 (PA14) => PHY ADDR0 + * ERX1 (PA15) => PHY ADDR1 + * ERX2 (PA25) => PHY ADDR2 + * ERX3 (PA26) => PHY ADDR3 + * ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 + * + * PHY has internal pull-down + */ + writel(pin_to_mask(AT91_PIN_PA14) | + pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA17) | + pin_to_mask(AT91_PIN_PA28), + pin_to_controller(AT91_PIN_PA0) + 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_PA14) | + pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA17) | + pin_to_mask(AT91_PIN_PA28), + pin_to_controller(AT91_PIN_PA0) + PIO_PUER); + + at91_macb_hw_init(); +} +#endif + +int board_init(void) +{ + /* Enable Ctrlc */ + console_init_f(); + +#ifdef CONFIG_PORTUXG20 + gd->bd->bi_arch_number = MACH_TYPE_PORTUXG20; +#else + gd->bd->bi_arch_number = MACH_TYPE_STAMP9G20; +#endif + + /* adress of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + at91_set_gpio_output(AT91_PIN_PC9, 1); + at91_set_gpio_output(AT91_PIN_PC5, 1); + + at91_serial_hw_init(); +#ifdef CONFIG_CMD_NAND + stamp9G20_nand_hw_init(); +#endif +#ifdef CONFIG_HAS_DATAFLASH + at91_spi0_hw_init((1 << 0) || (1 << 1)); +#endif +#ifdef CONFIG_MACB + stamp9G20_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; +} + +#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 +} +#endif + +int board_eth_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_MACB + rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00); +#endif + return rc; +} diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..5008554 --- /dev/null +++ b/include/configs/stamp9G20.h @@ -0,0 +1,197 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop stelian.pop@leadtechdesign.com + * Lead Tech Design <www.leadtechdesign.com> + * (C) Achim Ehrlich aehrlich@taskit.de + * taskit GmbH <www.taskit.de> + * + * Configuation settings for the Stamp9G20 CPU module. + * + * 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 + +#define CONFIG_AT91_LEGACY +#define CONFIG_AT91_GPIO + +/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ +#define CONFIG_SYS_HZ 1000 /* 1ms resolution */ + + +#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define AT91_CPU_NAME "AT91SAM9G20" +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ +#define CONFIG_ARCH_CPU_INIT +#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ + +#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 + +/* pad the watchdog */ + +#define CONFIG_AT91SAM9_WATCHDOG +#define CONFIG_HW_WATCHDOG + + +/* + * Hardware drivers + */ +#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */ + +/* LED */ + +#undef CONFIG_AT91_LED + + +#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_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING 1 +#define CONFIG_CMD_DHCP 1 +#define CONFIG_CMD_NAND 1 +#define CONFIG_CMD_USB 1 + + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM 0x20000000 +#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ + +/* DataFlash */ +#undef CONFIG_ATMEL_DATAFLASH_SPI +#undef CONFIG_HAS_DATAFLASH + + +/* 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_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ +#endif + +/* NOR flash - no real flash on this board */ +#define CONFIG_SYS_NO_FLASH 1 + +/* Ethernet */ +#define CONFIG_MACB 1 +#define CONFIG_RMII 1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_NET_RETRY_COUNT 20 +#define CONFIG_RESET_PHY_R 1 + +/* USB */ +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_DOS_PARTITION 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */ +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE 1 +#define CONFIG_CMD_FAT 1 + +#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ + +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_END 0x23e00000 + + + +/* 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 "run sdboot" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mtdparts=mtdparts=atmel_nand:128k(bootstrap)ro," \ + "256k(uboot)ro,128k(env1)ro," \ + "128k(env2)ro,2M(linux),-(root)rw\0" \ + "sdboot=setenv bootargs ${basicargs} ${mtdparts} " \ + "root=/dev/mmcblk0p1 rootdelay=1; " \ + "nand read 0x22000000 0xA0000 0x200000; " \ + "bootm 22000000\0" \ + "flashboot=setenv bootargs ${basicargs} ${mtdparts} " \ + "root=/dev/mtdblock5 rootfstype=jffs2; " \ + "nand read 0x22000000 0xA0000 0x200000; " \ + "bootm 22000000\0" \ + "basicargs=console=ttyS0,115200 mem=64M\0" \ + "" + + + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } + +#define CONFIG_SYS_PROMPT "U-Boot> " +#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 ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000) +#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

Dear Achim Ehrlich,
In message 4B7C14EC.7050209@taskit.de you wrote:
Signed-off-by: Achim Ehrlich aehrlich@taskit.de
...
--- a/Makefile +++ b/Makefile @@ -2906,6 +2906,15 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
+portuxG20_config \ +stamp9G20_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring portux,$@)" ] ; then \
echo "#define CONFIG_PORTUXG20 1" >$(obj)include/config.h; \
$(XECHO) "... PortuxG20";\
- fi;
NAK. We don't accept such scripting in the Makefile any more. Please use the available mkconfig features instead.
diff --git a/board/taskit/stamp9G20/partition.c b/board/taskit/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/taskit/stamp9G20/partition.c
So we are adding yet another copy of this file. We already have 12 of these. Mostly identical.
Isn't there a more intelligent way to handle this?
...
+int dram_init(void) +{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
- return 0;
+}
Please consider using get_ram_size() for memory auto-sizing and testing.
+#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ +#ifdef CONFIG_MACB
CONFIG_MACB seems to be an undocumented variable. What is it supposed to do?
diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..5008554 --- /dev/null +++ b/include/configs/stamp9G20.h
...
+/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
This should be changed into a CONFIG_SYS_ (globally).
+#define AT91_CPU_NAME "AT91SAM9G20"
Ditto.
+#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */
Do not undefine what is not defined anyway.
+/* LED */
+#undef CONFIG_AT91_LED
Ditto.
+/*
- Command line configuration.
- */
+#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_SOURCE
Is there any specific reason for disabling the "bdi", "imi", "imls" and "source" commands? They are pretty useful, and you don't seem to be especially short on resources...
...
+/* USB */ +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_DOS_PARTITION 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */
Line too long. Please fix globally.
...
- "basicargs=console=ttyS0,115200 mem=64M\0" \
- ""
Excessive white space. Drop 3 of the empty lines.
Best regards,
Wolfgang Denk

Dear Wolfgang Denk,
In message 4B7C14EC.7050209@taskit.de you wrote:
Signed-off-by: Achim Ehrlich aehrlich@taskit.de
...
--- a/Makefile +++ b/Makefile @@ -2906,6 +2906,15 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
+portuxG20_config \ +stamp9G20_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring portux,$@)" ] ; then \
echo "#define CONFIG_PORTUXG20 1" >$(obj)include/config.h; \
$(XECHO) "... PortuxG20";\
- fi;
NAK. We don't accept such scripting in the Makefile any more. Please use the available mkconfig features instead.
Sorry, I overlooked that feature and will change that.
diff --git a/board/taskit/stamp9G20/partition.c b/board/taskit/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/taskit/stamp9G20/partition.c
So we are adding yet another copy of this file. We already have 12 of these. Mostly identical.
Isn't there a more intelligent way to handle this?
The file has not much content anyway. I can get rid of it completely.
...
+int dram_init(void) +{
- gd->bd->bi_dram[0].start = PHYS_SDRAM;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
- return 0;
+}
Please consider using get_ram_size() for memory auto-sizing and testing.
Thanks for the hint, i will test it.
+#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ +#ifdef CONFIG_MACB
CONFIG_MACB seems to be an undocumented variable. What is it supposed to do?
It switches on the pin initialization for the Ethernet MAC. Actually, i just copied this part from the AT91SAM9260ek board code.
diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..5008554 --- /dev/null +++ b/include/configs/stamp9G20.h
...
+/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
This should be changed into a CONFIG_SYS_ (globally).
Do you mean, I should change that for all AT91-Boards in u-boot? How or who is going to test that?
+#define AT91_CPU_NAME "AT91SAM9G20"
Ditto.
+#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */
Do not undefine what is not defined anyway.
+/* LED */
+#undef CONFIG_AT91_LED
Ditto.
+/*
- Command line configuration.
- */
+#include <config_cmd_default.h> +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_SOURCE
Is there any specific reason for disabling the "bdi", "imi", "imls" and "source" commands? They are pretty useful, and you don't seem to be especially short on resources...
...
+/* USB */ +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_DOS_PARTITION 1 +#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */
Line too long. Please fix globally.
...
- "basicargs=console=ttyS0,115200 mem=64M\0" \
- ""
Excessive white space. Drop 3 of the empty lines.
I will fix these as well.
Thank you for your corrections.
Kind regards
Achim

Dear Achim Ehrlich,
In message 4B827909.3010804@taskit.de you wrote:
+#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ +#ifdef CONFIG_MACB
CONFIG_MACB seems to be an undocumented variable. What is it supposed to do?
It switches on the pin initialization for the Ethernet MAC. Actually, i just copied this part from the AT91SAM9260ek board code.
If you uuse it, please add a short note to the READMe, then.
But do you really need this? What would reset_phy() do if this variable was not set?
diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..5008554 --- /dev/null +++ b/include/configs/stamp9G20.h
...
+/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
This should be changed into a CONFIG_SYS_ (globally).
Do you mean, I should change that for all AT91-Boards in u-boot?
Such a change would indeed make sense to me (it should be done separately and indenpendent from your patch, probably before adding your code).
How or who is going to test that?
We can compare the binary images for all AT91 builds - except for the time stamps they should be unaffected by this change. And we can actually test the images on a few boards.
Best regards,
Wolfgang Denk

Hi Achim,
Signed-off-by: Achim Ehrlich aehrlich@taskit.de
Makefile | 9 ++ board/taskit/stamp9G20/Makefile | 56 ++++++++++ board/taskit/stamp9G20/config.mk | 1 + board/taskit/stamp9G20/led.c | 35 ++++++ board/taskit/stamp9G20/partition.c | 40 +++++++ board/taskit/stamp9G20/stamp9G20.c | 200 ++++++++++++++++++++++++++++++++++++ include/configs/stamp9G20.h | 197 +++++++++++++++++++++++++++++++++++ 7 files changed, 538 insertions(+), 0 deletions(-) create mode 100644 board/taskit/stamp9G20/Makefile create mode 100644 board/taskit/stamp9G20/config.mk create mode 100644 board/taskit/stamp9G20/led.c create mode 100644 board/taskit/stamp9G20/partition.c create mode 100644 board/taskit/stamp9G20/stamp9G20.c create mode 100644 include/configs/stamp9G20.h
diff --git a/Makefile b/Makefile index 524b9da..ef1a7d4 100644 --- a/Makefile +++ b/Makefile @@ -2906,6 +2906,15 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
+portuxG20_config \ +stamp9G20_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring portux,$@)" ] ; then \
echo "#define CONFIG_PORTUXG20 1" >$(obj)include/config.h; \
$(XECHO) "... PortuxG20";\
- fi;
- @$(MKCONFIG) -a stamp9G20 arm arm926ejs stamp9G20 taskit at91
######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. integratorap_config \ diff --git a/board/taskit/stamp9G20/Makefile b/board/taskit/stamp9G20/Makefile new file mode 100644 index 0000000..ef82428 --- /dev/null +++ b/board/taskit/stamp9G20/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# (C) Copyright 2008 +# Stelian Pop stelian.pop@leadtechdesign.com +# Lead Tech Design <www.leadtechdesign.com>
Well actually I am not a fan of including all these copyrights in a file which has so little content - so I'd vote to remove them and include your own copyright.
But if for some reason the copyrights are not removed, then please at least add yourself in.
[...]
diff --git a/board/taskit/stamp9G20/led.c b/board/taskit/stamp9G20/led.c new file mode 100644 index 0000000..dc6ac63 --- /dev/null +++ b/board/taskit/stamp9G20/led.c @@ -0,0 +1,35 @@ +/*
- (C) Copyright 2007-2008
- Stelian Pop stelian.pop@leadtechdesign.com
- Lead Tech Design <www.leadtechdesign.com>
Dito.
- 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/at91_pmc.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h>
+void coloured_LED_init(void) +{
- /* Enable clock */
- at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC);
+} diff --git a/board/taskit/stamp9G20/partition.c b/board/taskit/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/taskit/stamp9G20/partition.c @@ -0,0 +1,40 @@ +/*
- (C) Copyright 2008
- Ulf Samuelsson ulf@atmel.com
Dito.
diff --git a/board/taskit/stamp9G20/stamp9G20.c b/board/taskit/stamp9G20/stamp9G20.c new file mode 100644 index 0000000..28cd8b1 --- /dev/null +++ b/board/taskit/stamp9G20/stamp9G20.c @@ -0,0 +1,200 @@ +/*
- (C) Copyright 2007-2008
- Stelian Pop stelian.pop@leadtechdesign.com
- Lead Tech Design <www.leadtechdesign.com>
- Achim Ehrlich aehrlich@taskit.de
- taskit GmbH <www.taskit.de>
Ok, this time you added your name - although I would have expected a year.
Cheers Detlev

Hello Detlef,
Signed-off-by: Achim Ehrlich aehrlich@taskit.de
Makefile | 9 ++ board/taskit/stamp9G20/Makefile | 56 ++++++++++ board/taskit/stamp9G20/config.mk | 1 + board/taskit/stamp9G20/led.c | 35 ++++++ board/taskit/stamp9G20/partition.c | 40 +++++++ board/taskit/stamp9G20/stamp9G20.c | 200 ++++++++++++++++++++++++++++++++++++ include/configs/stamp9G20.h | 197 +++++++++++++++++++++++++++++++++++ 7 files changed, 538 insertions(+), 0 deletions(-) create mode 100644 board/taskit/stamp9G20/Makefile create mode 100644 board/taskit/stamp9G20/config.mk create mode 100644 board/taskit/stamp9G20/led.c create mode 100644 board/taskit/stamp9G20/partition.c create mode 100644 board/taskit/stamp9G20/stamp9G20.c create mode 100644 include/configs/stamp9G20.h
diff --git a/Makefile b/Makefile index 524b9da..ef1a7d4 100644 --- a/Makefile +++ b/Makefile @@ -2906,6 +2906,15 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
+portuxG20_config \ +stamp9G20_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring portux,$@)" ] ; then \
echo "#define CONFIG_PORTUXG20 1" >$(obj)include/config.h; \
$(XECHO) "... PortuxG20";\
- fi;
- @$(MKCONFIG) -a stamp9G20 arm arm926ejs stamp9G20 taskit at91
######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. integratorap_config \ diff --git a/board/taskit/stamp9G20/Makefile b/board/taskit/stamp9G20/Makefile new file mode 100644 index 0000000..ef82428 --- /dev/null +++ b/board/taskit/stamp9G20/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# (C) Copyright 2008 +# Stelian Pop stelian.pop@leadtechdesign.com +# Lead Tech Design <www.leadtechdesign.com>
Well actually I am not a fan of including all these copyrights in a file which has so little content - so I'd vote to remove them and include your own copyright.
But if for some reason the copyrights are not removed, then please at least add yourself in.
[...]
OK.
diff --git a/board/taskit/stamp9G20/led.c b/board/taskit/stamp9G20/led.c new file mode 100644 index 0000000..dc6ac63 --- /dev/null +++ b/board/taskit/stamp9G20/led.c @@ -0,0 +1,35 @@ +/*
- (C) Copyright 2007-2008
- Stelian Pop stelian.pop@leadtechdesign.com
- Lead Tech Design <www.leadtechdesign.com>
Dito.
I haven't changed one bit in this file, I really do not feel like even adding my copyright.
- 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/at91_pmc.h> +#include <asm/arch/gpio.h> +#include <asm/arch/io.h>
+void coloured_LED_init(void) +{
- /* Enable clock */
- at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC);
+} diff --git a/board/taskit/stamp9G20/partition.c b/board/taskit/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/taskit/stamp9G20/partition.c @@ -0,0 +1,40 @@ +/*
- (C) Copyright 2008
- Ulf Samuelsson ulf@atmel.com
Dito.
diff --git a/board/taskit/stamp9G20/stamp9G20.c b/board/taskit/stamp9G20/stamp9G20.c new file mode 100644 index 0000000..28cd8b1 --- /dev/null +++ b/board/taskit/stamp9G20/stamp9G20.c @@ -0,0 +1,200 @@ +/*
- (C) Copyright 2007-2008
- Stelian Pop stelian.pop@leadtechdesign.com
- Lead Tech Design <www.leadtechdesign.com>
- Achim Ehrlich aehrlich@taskit.de
- taskit GmbH <www.taskit.de>
Ok, this time you added your name - although I would have expected a year.
Hmm, right.
Kind regards
Achim

Hello Achim,
[...]
diff --git a/board/taskit/stamp9G20/led.c b/board/taskit/stamp9G20/led.c new file mode 100644 index 0000000..dc6ac63 --- /dev/null +++ b/board/taskit/stamp9G20/led.c @@ -0,0 +1,35 @@ +/*
- (C) Copyright 2007-2008
- Stelian Pop stelian.pop@leadtechdesign.com
- Lead Tech Design <www.leadtechdesign.com>
Dito.
I haven't changed one bit in this file, I really do not feel like even adding my copyright.
Actually you have copied the file into a new context and use it in a different way than the original file.
I know that this case is somewhat on the border but if somebody reads the code from a tar-archive, it surely looks like Stelian Pop created this specific instance of this file which is not correct.
Cheers Detlev
participants (3)
-
Achim Ehrlich
-
Detlev Zundel
-
Wolfgang Denk