[U-Boot] [PATCH 00/15] [REWORK AVR32/AT91] additional changes for avr32
This series do some cleanup all avr32 boards. This series is on top of 'Get AVR32 boards working with partial linking' rebased to u-boot-atmel/rework110202.
In summary the board specific config.mk and u-boot.lds files are deleted in favor of a version at architecture level. Theses files had all the same content cause they where pure copies of the atstk100x ones.
I have splitted the patches to each board cause some of them should be actively maintained and the respectively maintainer should have a chance to give some feedback.
Andreas Bießmann (15): avr32/config.mk: simplify PLATFORM_RELFLAGS avr32: use single linker script atngw100: fix "#define XXXX 1" atstk1002: fix "#define XXXX 1" atstk1003: fix "#define XXXX 1" atstk1004: fix "#define XXXX 1" atstk1006: fix "#define XXXX 1" favr-32-ezkit: fix "#define XXXX 1" hammerhead: fix "#define XXXX 1" mimc200: fix "#define XXXX 1" atngw100: move CONFIG_SYS_TEXT_BASE to header atstk100x: move CONFIG_SYS_TEXT_BASE to header favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header mimc200: move CONFIG_SYS_TEXT_BASE to header hammerhead: move CONFIG_SYS_TEXT_BASE to header
arch/avr32/config.mk | 4 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/config.mk | 2 - board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 3 - board/earthlcd/favr-32-ezkit/config.mk | 3 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/config.mk | 2 - board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/config.mk | 2 - board/miromico/hammerhead/u-boot.lds | 72 -------------------- include/configs/atngw100.h | 55 ++++++++------- include/configs/atstk1002.h | 49 +++++++------- include/configs/atstk1003.h | 43 ++++++------ include/configs/atstk1004.h | 43 ++++++------ include/configs/atstk1006.h | 49 +++++++------- include/configs/favr-32-ezkit.h | 47 +++++++------ include/configs/hammerhead.h | 49 +++++++------- include/configs/mimc200.h | 57 ++++++++-------- 19 files changed, 204 insertions(+), 490 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/config.mk delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/atmel/atstk1000/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/config.mk delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/config.mk delete mode 100644 board/miromico/hammerhead/u-boot.lds
This patch removes PLATFORM_RELFLAGS from board specific config.mk files and define them in arch specific config.mk file.
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- arch/avr32/config.mk | 2 ++ board/atmel/atngw100/config.mk | 1 - board/atmel/atstk1000/config.mk | 1 - board/earthlcd/favr-32-ezkit/config.mk | 1 - board/mimc/mimc200/config.mk | 1 - board/miromico/hammerhead/config.mk | 1 - 6 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index 51b9995..eab4b49 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -26,4 +26,6 @@ CROSS_COMPILE ?= avr32-linux- STANDALONE_LOAD_ADDR = 0x00000000
PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + LDFLAGS_u-boot = --gc-sections --relax diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk index c3c7433..34b709a 100644 --- a/board/atmel/atngw100/config.mk +++ b/board/atmel/atngw100/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index bec7b7d..bcc0886 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index eb607ee..838660f 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk index c3c7433..34b709a 100644 --- a/board/mimc/mimc200/config.mk +++ b/board/mimc/mimc200/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk index c3c7433..34b709a 100644 --- a/board/miromico/hammerhead/config.mk +++ b/board/miromico/hammerhead/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
This patch move the atstk100x linker script to $(CPUDIR) and delete other pure copies of this file in each board directory.
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- arch/avr32/config.mk | 2 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 1 - board/earthlcd/favr-32-ezkit/config.mk | 1 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/u-boot.lds | 72 -------------------- 8 files changed, 2 insertions(+), 288 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/u-boot.lds
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index eab4b49..9a98bc4 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -29,3 +29,5 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
LDFLAGS_u-boot = --gc-sections --relax + +LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/board/atmel/atstk1000/u-boot.lds b/arch/avr32/cpu/u-boot.lds similarity index 100% rename from board/atmel/atstk1000/u-boot.lds rename to arch/avr32/cpu/u-boot.lds diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds deleted file mode 100644 index a7243f2..0000000 --- a/board/atmel/atngw100/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - _end = .; -} diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index bcc0886..34b709a 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index 838660f..34b709a 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/u-boot.lds b/board/earthlcd/favr-32-ezkit/u-boot.lds deleted file mode 100644 index 0d413a0..0000000 --- a/board/earthlcd/favr-32-ezkit/u-boot.lds +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2008 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss (NOLOAD) : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - _end = .; -} diff --git a/board/mimc/mimc200/u-boot.lds b/board/mimc/mimc200/u-boot.lds deleted file mode 100644 index a7243f2..0000000 --- a/board/mimc/mimc200/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - _end = .; -} diff --git a/board/miromico/hammerhead/u-boot.lds b/board/miromico/hammerhead/u-boot.lds deleted file mode 100644 index a7243f2..0000000 --- a/board/miromico/hammerhead/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - _end = .; -}
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/atngw100.h | 54 ++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index a93ba8b..70f1e8a 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -26,10 +26,10 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATNGW100 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATNGW100
#define CONFIG_SYS_HZ 1000
@@ -38,8 +38,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -64,11 +64,11 @@ #define CONFIG_USART_BASE ATMEL_BASE_USART1 #define CONFIG_USART_ID 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -83,8 +83,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -95,8 +95,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -123,25 +123,25 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 -#define CONFIG_ATMEL_SPI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI +#define CONFIG_ATMEL_SPI
-#define CONFIG_SPI_FLASH 1 -#define CONFIG_SPI_FLASH_ATMEL 1 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_ATMEL
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -154,7 +154,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -172,7 +172,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/atstk1002.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index ba1b56c..997e9dd 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1002 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1002 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -196,7 +196,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/atstk1003.h | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 85337bf..9cc5cb9 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7001 1 -#define CONFIG_ATSTK1003 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7001 +#define CONFIG_ATSTK1003 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -178,7 +178,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/atstk1004.h | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 344ba8f..a225395 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7002 1 -#define CONFIG_ATSTK1004 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7002 +#define CONFIG_ATSTK1004 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -178,7 +178,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/atstk1006.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index e8553fc..d681929 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1006 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1006 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -196,7 +196,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x3f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/favr-32-ezkit.h | 46 +++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index e723ad1..f364dad 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -24,12 +24,12 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_FAVR32_EZKIT 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_FAVR32_EZKIT
-#define CONFIG_FAVR32_EZKIT_EXT_FLASH 1 +#define CONFIG_FAVR32_EZKIT_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -43,8 +43,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -86,11 +86,11 @@ #define CONFIG_USART_ID 3
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -106,8 +106,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -118,8 +118,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -145,13 +145,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -175,7 +175,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -193,7 +193,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/hammerhead.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 1f20fff..5a2d146 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -24,10 +24,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_HAMMERHEAD 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_HAMMERHEAD
#define CONFIG_SYS_HZ 1000
@@ -36,8 +36,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 25000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 5 @@ -65,11 +65,11 @@ #define CONFIG_HOSTNAME hammerhead
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -84,8 +84,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -96,8 +96,8 @@ * should be generated and assigned to the environment variables * "ethaddr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -119,21 +119,21 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_SETGETDCR
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -147,7 +147,7 @@
#define CONFIG_SYS_SDRAM_BASE 0x10000000
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -166,7 +166,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- include/configs/mimc200.h | 56 ++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index f004ec8..66b9477 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -26,12 +26,12 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_MIMC200 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_MIMC200
-#define CONFIG_MIMC200_EXT_FLASH 1 +#define CONFIG_MIMC200_EXT_FLASH
#define CONFIG_SYS_HZ 1000
@@ -40,8 +40,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 10000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 15 @@ -69,11 +69,11 @@ #define CONFIG_MIMC200_DBGLINK 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -83,9 +83,9 @@ #define CONFIG_BOOTCOMMAND \ "fsload boot/uImage; bootm"
-#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ -#define CONFIG_DISABLE_CONSOLE 1 /* disable console */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ +#define CONFIG_SILENT_CONSOLE /* enable silent startup */ +#define CONFIG_DISABLE_CONSOLE /* disable console */ +#define CONFIG_SYS_DEVICE_NULLDEV /* include nulldev device */
#define CONFIG_LCD 1
@@ -94,16 +94,16 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 0 -#define CONFIG_ZERO_BOOTDELAY_CHECK 1 -#define CONFIG_AUTOBOOT 1 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#define CONFIG_AUTOBOOT
/* * After booting the board for the first time, new ethernet addresses * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -124,13 +124,13 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NET
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#if defined(CONFIG_LCD) #define CONFIG_CMD_BMP @@ -151,8 +151,8 @@
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -168,7 +168,7 @@ #define CONFIG_SYS_FRAM_BASE 0x08000000 #define CONFIG_SYS_FRAM_SIZE 0x20000
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -186,7 +186,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- board/atmel/atngw100/config.mk | 1 - include/configs/atngw100.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atngw100/config.mk
diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/atmel/atngw100/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 70f1e8a..bda6eed 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -149,6 +149,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- board/atmel/atstk1000/config.mk | 1 - include/configs/atstk1002.h | 1 + include/configs/atstk1003.h | 1 + include/configs/atstk1004.h | 1 + include/configs/atstk1006.h | 1 + 5 files changed, 4 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atstk1000/config.mk
diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/atmel/atstk1000/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 997e9dd..c17d107 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 9cc5cb9..a77d52e 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index a225395..cc00a0a 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index d681929..2cff140 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- board/earthlcd/favr-32-ezkit/config.mk | 1 - include/configs/favr-32-ezkit.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index f364dad..4c30b39 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -170,6 +170,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- board/mimc/mimc200/config.mk | 1 - include/configs/mimc200.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/mimc/mimc200/config.mk
diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/mimc/mimc200/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 66b9477..6c52769 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -160,6 +160,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- board/miromico/hammerhead/config.mk | 1 - include/configs/hammerhead.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/miromico/hammerhead/config.mk
diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/miromico/hammerhead/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 5a2d146..bfdfc0a 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -141,6 +141,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE 0x24000000 #define CONFIG_SYS_INTRAM_SIZE 0x8000
Dear Reinhard,
Am 09.02.2011 16:40, schrieb Andreas Bießmann:
This series do some cleanup all avr32 boards. This series is on top of 'Get AVR32 boards working with partial linking' rebased to u-boot-atmel/rework110202.
In summary the board specific config.mk and u-boot.lds files are deleted in favor of a version at architecture level. Theses files had all the same content cause they where pure copies of the atstk100x ones.
I have splitted the patches to each board cause some of them should be actively maintained and the respectively maintainer should have a chance to give some feedback.
Andreas Bießmann (15): avr32/config.mk: simplify PLATFORM_RELFLAGS avr32: use single linker script atngw100: fix "#define XXXX 1" atstk1002: fix "#define XXXX 1" atstk1003: fix "#define XXXX 1" atstk1004: fix "#define XXXX 1" atstk1006: fix "#define XXXX 1" favr-32-ezkit: fix "#define XXXX 1" hammerhead: fix "#define XXXX 1" mimc200: fix "#define XXXX 1" atngw100: move CONFIG_SYS_TEXT_BASE to header atstk100x: move CONFIG_SYS_TEXT_BASE to header favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header mimc200: move CONFIG_SYS_TEXT_BASE to header hammerhead: move CONFIG_SYS_TEXT_BASE to header
arch/avr32/config.mk | 4 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/config.mk | 2 - board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 3 - board/earthlcd/favr-32-ezkit/config.mk | 3 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/config.mk | 2 - board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/config.mk | 2 - board/miromico/hammerhead/u-boot.lds | 72 -------------------- include/configs/atngw100.h | 55 ++++++++------- include/configs/atstk1002.h | 49 +++++++------- include/configs/atstk1003.h | 43 ++++++------ include/configs/atstk1004.h | 43 ++++++------ include/configs/atstk1006.h | 49 +++++++------- include/configs/favr-32-ezkit.h | 47 +++++++------ include/configs/hammerhead.h | 49 +++++++------- include/configs/mimc200.h | 57 ++++++++-------- 19 files changed, 204 insertions(+), 490 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/config.mk delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/atmel/atstk1000/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/config.mk delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/config.mk delete mode 100644 board/miromico/hammerhead/u-boot.lds
would you take these too?
regards
Andreas Bießmann
Dear Andreas Bießmann,
This series do some cleanup all avr32 boards. This series is on top of 'Get AVR32 boards working with partial linking' rebased to u-boot-atmel/rework110202.
In summary the board specific config.mk and u-boot.lds files are deleted in favor of a version at architecture level. Theses files had all the same content cause they where pure copies of the atstk100x ones.
I have splitted the patches to each board cause some of them should be actively maintained and the respectively maintainer should have a chance to give some feedback.
Andreas Bießmann (15): avr32/config.mk: simplify PLATFORM_RELFLAGS avr32: use single linker script atngw100: fix "#define XXXX 1" atstk1002: fix "#define XXXX 1" atstk1003: fix "#define XXXX 1" atstk1004: fix "#define XXXX 1" atstk1006: fix "#define XXXX 1" favr-32-ezkit: fix "#define XXXX 1" hammerhead: fix "#define XXXX 1" mimc200: fix "#define XXXX 1" atngw100: move CONFIG_SYS_TEXT_BASE to header atstk100x: move CONFIG_SYS_TEXT_BASE to header favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header mimc200: move CONFIG_SYS_TEXT_BASE to header hammerhead: move CONFIG_SYS_TEXT_BASE to header
arch/avr32/config.mk | 4 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/config.mk | 2 - board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 3 - board/earthlcd/favr-32-ezkit/config.mk | 3 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/config.mk | 2 - board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/config.mk | 2 - board/miromico/hammerhead/u-boot.lds | 72 -------------------- include/configs/atngw100.h | 55 ++++++++------- include/configs/atstk1002.h | 49 +++++++------- include/configs/atstk1003.h | 43 ++++++------ include/configs/atstk1004.h | 43 ++++++------ include/configs/atstk1006.h | 49 +++++++------- include/configs/favr-32-ezkit.h | 47 +++++++------ include/configs/hammerhead.h | 49 +++++++------- include/configs/mimc200.h | 57 ++++++++-------- 19 files changed, 204 insertions(+), 490 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/config.mk delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/atmel/atstk1000/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/config.mk delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/config.mk delete mode 100644 board/miromico/hammerhead/u-boot.lds
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
Can you please rebase the series against next or resubmit the failed parts against next2?
Best Regards,
Reinhard
reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-2-3-avr32-fix-linking.patch Applying avr32: fix linking reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-01-15-avr32-config.mk-simplify-PLATFORM_RELFLAGS.patch Applying avr32/config.mk: simplify PLATFORM_RELFLAGS reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-02-15-avr32-use-single-linker-script.patch Applying avr32: use single linker script error: patch failed: board/atmel/atngw100/u-boot.lds:1 error: board/atmel/atngw100/u-boot.lds: patch does not apply error: patch failed: board/earthlcd/favr-32-ezkit/u-boot.lds:1 error: board/earthlcd/favr-32-ezkit/u-boot.lds: patch does not apply error: patch failed: board/mimc/mimc200/u-boot.lds:1 error: board/mimc/mimc200/u-boot.lds: patch does not apply error: patch failed: board/miromico/hammerhead/u-boot.lds:1 error: board/miromico/hammerhead/u-boot.lds: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". reinhard@sieb:~/embedded/u-boot-atmel$ git am --skip Nothing to do. reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-03-15-atngw100-fix-define-XXXX-1.patch Applying atngw100: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-04-15-atstk1002-fix-define-XXXX-1.patch Applying atstk1002: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-05-15-atstk1003-fix-define-XXXX-1.patch Applying atstk1003: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-06-15-atstk1004-fix-define-XXXX-1.patch Applying atstk1004: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-07-15-atstk1006-fix-define-XXXX-1.patch Applying atstk1006: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-08-15-favr-32-ezkit-fix-define-XXXX-1.patch Applying favr-32-ezkit: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-09-15-hammerhead-fix-define-XXXX-1.patch Applying hammerhead: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-10-15-mimc200-fix-define-XXXX-1.patch Applying mimc200: fix "#define XXXX 1" reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-11-15-atngw100-move-CONFIG_SYS_TEXT_BASE-to-header.patch Applying atngw100: move CONFIG_SYS_TEXT_BASE to header reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-12-15-atstk100x-move-CONFIG_SYS_TEXT_BASE-to-header.patch Applying atstk100x: move CONFIG_SYS_TEXT_BASE to header error: patch failed: board/atmel/atstk1000/config.mk:1 error: board/atmel/atstk1000/config.mk: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". reinhard@sieb:~/embedded/u-boot-atmel$ git am --skip Nothing to do. reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-13-15-favr-32-ezkit-move-CONFIG_SYS_TEXT_BASE-to-header.patch Applying favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header error: patch failed: board/earthlcd/favr-32-ezkit/config.mk:1 error: board/earthlcd/favr-32-ezkit/config.mk: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". reinhard@sieb:~/embedded/u-boot-atmel$ git am --skip Nothing to do. reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-14-15-mimc200-move-CONFIG_SYS_TEXT_BASE-to-header.patch Applying mimc200: move CONFIG_SYS_TEXT_BASE to header reinhard@sieb:~/embedded/u-boot-atmel$ git am U-Boot-15-15-hammerhead-move-CONFIG_SYS_TEXT_BASE-to-header.patch Applying hammerhead: move CONFIG_SYS_TEXT_BASE to header reinhard@sieb:~/embedded/u-boot-atmel$
Dear Reinhard Meyer,
Am 18.04.2011 14:49, schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
I can check that and will rebase on u-boot-atmel/next. BTW I personally dislike your inflationary creation of new branches. The last days I could not understand why there are that much reworkXXX branches for AT91 stuff. I hope only the one with latest timestamp is worth to work with. Isn't that reworked stuff already in next branch? Or are there some tasks not yet in next branch?
Can you please rebase the series against next or resubmit the failed parts against next2?
I will rebase on u-boot-atmel/next, you can delete next2 branch, it makes no sense to me.
best regards
Andreas Bießmann
Dear Andreas Bießmann,
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
I can check that and will rebase on u-boot-atmel/next.
Applied to u-boot-atmel/next.
BTW I personally dislike your inflationary creation of new branches. The last days I could not understand why there are that much reworkXXX branches for AT91 stuff.
Those have a date which reflect the u-boot-arm/master they were rebased onto. I rather only remove them if and when all patches have been pulled into u-boot-arm (just in case).
I hope only the one with latest timestamp is worth to work with. Isn't that reworked stuff already in next branch? Or are there some tasks not yet in next branch?
Not all is in next, all changes I did to at9sam9260/9XE/9G20-ek and out own board (TOP9000) are not yet in next, I had problems rebasing them to current u-boot-arm/master and not enough time yet to fix that.
I will rebase on u-boot-atmel/next, you can delete next2 branch, it makes no sense to me.
next2 is always temporary until next is moved to next2.
Best Regards,
Reinhard
Dear Reinhard Meyer,
Am 19.04.2011 um 17:49 schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
I can check that and will rebase on u-boot-atmel/next.
Applied to u-boot-atmel/next.
BTW I personally dislike your inflationary creation of new branches. The last days I could not understand why there are that much reworkXXX branches for AT91 stuff.
Those have a date which reflect the u-boot-arm/master they were rebased onto. I rather only remove them if and when all patches have been pulled into u-boot-arm (just in case).
Ok, but changes to origin/master from 20101209 in rework101209 are not included in rework101217? This would not make sense to me.
I hope only the one with latest timestamp is worth to work with. Isn't that reworked stuff already in next branch? Or are there some tasks not yet in next branch?
Not all is in next, all changes I did to at9sam9260/9XE/9G20-ek and out own board (TOP9000) are not yet in next, I had problems rebasing them to current u-boot-arm/master and not enough time yet to fix that.
Ok, I've got an at91sam9260ek here and like to get it working with current mainline (plus the reworking stuff for at91 devices). Which branch should I take? Which changes are worth to look at for 2011.06 regarding sam9260 devices or is it too late for that?
best regards
Andreas Bießmann
Dear Andreas Bießmann,
Am 19.04.2011 um 17:49 schrieb Reinhard Meyer:
Dear Andreas Bießmann,
Some of the patches did not apply. What did apply is now found in u-boot-atmel/next2.
I have no idea why they do not apply, since the AVR32 part has not changed since 110202.
I can check that and will rebase on u-boot-atmel/next.
Applied to u-boot-atmel/next.
BTW I personally dislike your inflationary creation of new branches. The last days I could not understand why there are that much reworkXXX branches for AT91 stuff.
Those have a date which reflect the u-boot-arm/master they were rebased onto. I rather only remove them if and when all patches have been pulled into u-boot-arm (just in case).
Ok, but changes to origin/master from 20101209 in rework101209 are not included in rework101217? This would not make sense to me.
I said nothing like that.
I hope only the one with latest timestamp is worth to work with. Isn't that reworked stuff already in next branch? Or are there some tasks not yet in next branch?
Not all is in next, all changes I did to at9sam9260/9XE/9G20-ek and out own board (TOP9000) are not yet in next, I had problems rebasing them to current u-boot-arm/master and not enough time yet to fix that.
Ok, I've got an at91sam9260ek here and like to get it working with current mainline (plus the reworking stuff for at91 devices). Which branch should I take? Which changes are worth to look at for 2011.06 regarding sam9260 devices or is it too late for that?
Top 2 patches in rework110202 should do the trick, once they are made to apply to current next.
best regards
Reinhard
This series do some cleanup all avr32 boards. This series is on top of u-boot-atmel/next 4c91fde1ddf92a9bd08175936971f98ad23b250e
All boards are build-tested (MAKEALL); atstk1002 is tested on my eval board.
In summary the board specific config.mk and u-boot.lds files are deleted in favor of a version at architecture level. Theses files had all the same content cause they where pure copies of the atstk100x ones.
I have splitted the patches to each board cause some of them should be actively maintained and the respectively maintainer should have a chance to give some feedback.
Andreas Bießmann (15): avr32/config.mk: simplify PLATFORM_RELFLAGS avr32: use single linker script atngw100: fix "#define XXXX 1" atstk1002: fix "#define XXXX 1" atstk1003: fix "#define XXXX 1" atstk1004: fix "#define XXXX 1" atstk1006: fix "#define XXXX 1" favr-32-ezkit: fix "#define XXXX 1" hammerhead: fix "#define XXXX 1" mimc200: fix "#define XXXX 1" atngw100: move CONFIG_SYS_TEXT_BASE to header atstk100x: move CONFIG_SYS_TEXT_BASE to header favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header mimc200: move CONFIG_SYS_TEXT_BASE to header hammerhead: move CONFIG_SYS_TEXT_BASE to header
arch/avr32/config.mk | 4 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/config.mk | 2 - board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 3 - board/earthlcd/favr-32-ezkit/config.mk | 3 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/config.mk | 2 - board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/config.mk | 2 - board/miromico/hammerhead/u-boot.lds | 72 -------------------- include/configs/atngw100.h | 55 ++++++++------- include/configs/atstk1002.h | 49 +++++++------- include/configs/atstk1003.h | 43 ++++++------ include/configs/atstk1004.h | 43 ++++++------ include/configs/atstk1006.h | 49 +++++++------- include/configs/favr-32-ezkit.h | 47 +++++++------ include/configs/hammerhead.h | 49 +++++++------- include/configs/mimc200.h | 57 ++++++++-------- 19 files changed, 204 insertions(+), 490 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/config.mk delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/atmel/atstk1000/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/config.mk delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/config.mk delete mode 100644 board/miromico/hammerhead/u-boot.lds
This patch removes PLATFORM_RELFLAGS from board specific config.mk files and define them in arch specific config.mk file.
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
arch/avr32/config.mk | 2 ++ board/atmel/atngw100/config.mk | 1 - board/atmel/atstk1000/config.mk | 1 - board/earthlcd/favr-32-ezkit/config.mk | 1 - board/mimc/mimc200/config.mk | 1 - board/miromico/hammerhead/config.mk | 1 - 6 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index 51b9995..eab4b49 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -26,4 +26,6 @@ CROSS_COMPILE ?= avr32-linux- STANDALONE_LOAD_ADDR = 0x00000000
PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + LDFLAGS_u-boot = --gc-sections --relax diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk index c3c7433..34b709a 100644 --- a/board/atmel/atngw100/config.mk +++ b/board/atmel/atngw100/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index bec7b7d..bcc0886 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index eb607ee..838660f 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,3 +1,2 @@ -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections CONFIG_SYS_TEXT_BASE = 0x00000000 LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk index c3c7433..34b709a 100644 --- a/board/mimc/mimc200/config.mk +++ b/board/mimc/mimc200/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk index c3c7433..34b709a 100644 --- a/board/miromico/hammerhead/config.mk +++ b/board/miromico/hammerhead/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
This patch move the atstk100x linker script to $(CPUDIR) and delete other pure copies of this file in each board directory.
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- Changes since V1: - use LDSCRIPT = ... in favor of LDSCRIPT := ... - rebased on u-boot-atmel/next (dunno why this was necessary, there where no changes upstream since lkast submission)
arch/avr32/config.mk | 2 + .../atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds | 0 board/atmel/atngw100/u-boot.lds | 72 -------------------- board/atmel/atstk1000/config.mk | 1 - board/earthlcd/favr-32-ezkit/config.mk | 1 - board/earthlcd/favr-32-ezkit/u-boot.lds | 70 ------------------- board/mimc/mimc200/u-boot.lds | 72 -------------------- board/miromico/hammerhead/u-boot.lds | 72 -------------------- 8 files changed, 2 insertions(+), 288 deletions(-) rename {board/atmel/atstk1000 => arch/avr32/cpu}/u-boot.lds (100%) delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/u-boot.lds
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index eab4b49..f640769 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -29,3 +29,5 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
LDFLAGS_u-boot = --gc-sections --relax + +LDSCRIPT = $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/board/atmel/atstk1000/u-boot.lds b/arch/avr32/cpu/u-boot.lds similarity index 100% rename from board/atmel/atstk1000/u-boot.lds rename to arch/avr32/cpu/u-boot.lds diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds deleted file mode 100644 index 0a1a8e1..0000000 --- a/board/atmel/atngw100/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - __bss_end__ = .; -} diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk index bcc0886..34b709a 100644 --- a/board/atmel/atstk1000/config.mk +++ b/board/atmel/atstk1000/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -LDSCRIPT = $(src)board/atmel/atstk1000/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk index 838660f..34b709a 100644 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ b/board/earthlcd/favr-32-ezkit/config.mk @@ -1,2 +1 @@ CONFIG_SYS_TEXT_BASE = 0x00000000 -LDSCRIPT = $(src)board/earthlcd/favr-32-ezkit/u-boot.lds diff --git a/board/earthlcd/favr-32-ezkit/u-boot.lds b/board/earthlcd/favr-32-ezkit/u-boot.lds deleted file mode 100644 index 20e3631..0000000 --- a/board/earthlcd/favr-32-ezkit/u-boot.lds +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2008 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss (NOLOAD) : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - __bss_end__ = .; -} diff --git a/board/mimc/mimc200/u-boot.lds b/board/mimc/mimc200/u-boot.lds deleted file mode 100644 index 0a1a8e1..0000000 --- a/board/mimc/mimc200/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - __bss_end__ = .; -} diff --git a/board/miromico/hammerhead/u-boot.lds b/board/miromico/hammerhead/u-boot.lds deleted file mode 100644 index 0a1a8e1..0000000 --- a/board/miromico/hammerhead/u-boot.lds +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Fundamental -*- - * - * Copyright (C) 2005-2006 Atmel Corporation - * - * 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 - */ -OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") -OUTPUT_ARCH(avr32) -ENTRY(_start) - -SECTIONS -{ - . = 0; - _text = .; - .text : { - *(.exception.text) - *(.text) - *(.text.*) - } - _etext = .; - - .rodata : { - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - } - - . = ALIGN(8); - _data = .; - .data : { - *(.data) - *(.data.*) - } - - . = ALIGN(4); - __u_boot_cmd_start = .; - .u_boot_cmd : { - KEEP(*(.u_boot_cmd)) - } - __u_boot_cmd_end = .; - - . = ALIGN(4); - _got = .; - .got : { - *(.got) - } - _egot = .; - - . = ALIGN(8); - _edata = .; - - .bss : { - *(.bss) - *(.bss.*) - } - . = ALIGN(8); - __bss_end__ = .; -}
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/atngw100.h | 54 ++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index a93ba8b..70f1e8a 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -26,10 +26,10 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATNGW100 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATNGW100
#define CONFIG_SYS_HZ 1000
@@ -38,8 +38,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -64,11 +64,11 @@ #define CONFIG_USART_BASE ATMEL_BASE_USART1 #define CONFIG_USART_ID 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -83,8 +83,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -95,8 +95,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -123,25 +123,25 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 -#define CONFIG_ATMEL_SPI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI +#define CONFIG_ATMEL_SPI
-#define CONFIG_SPI_FLASH 1 -#define CONFIG_SPI_FLASH_ATMEL 1 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_ATMEL
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -154,7 +154,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -172,7 +172,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/atstk1002.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index ba1b56c..997e9dd 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1002 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1002 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -196,7 +196,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/atstk1003.h | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 85337bf..9cc5cb9 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7001 1 -#define CONFIG_ATSTK1003 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7001 +#define CONFIG_ATSTK1003 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -178,7 +178,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/atstk1004.h | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 344ba8f..a225395 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7002 1 -#define CONFIG_ATSTK1004 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7002 +#define CONFIG_ATSTK1004 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -133,11 +133,11 @@ #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_PORTMUX_PIO 1 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_ATMEL_USART +#define CONFIG_PORTMUX_PIO +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -161,7 +161,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -178,7 +178,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/atstk1006.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index e8553fc..d681929 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -26,13 +26,13 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_ATSTK1006 1 -#define CONFIG_ATSTK1000 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_ATSTK1006 +#define CONFIG_ATSTK1000
-#define CONFIG_ATSTK1000_EXT_FLASH 1 +#define CONFIG_ATSTK1000_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -46,8 +46,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -89,11 +89,11 @@ #define CONFIG_USART_ID 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -109,8 +109,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -121,8 +121,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -148,13 +148,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -178,7 +178,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -196,7 +196,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x3f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/favr-32-ezkit.h | 46 +++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index e723ad1..f364dad 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -24,12 +24,12 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_FAVR32_EZKIT 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_FAVR32_EZKIT
-#define CONFIG_FAVR32_EZKIT_EXT_FLASH 1 +#define CONFIG_FAVR32_EZKIT_EXT_FLASH
/* * Timer clock frequency. We're using the CPU-internal COUNT register @@ -43,8 +43,8 @@ * PLL frequency. * (CONFIG_SYS_OSC0_HZ * CONFIG_SYS_PLL0_MUL) / CONFIG_SYS_PLL0_DIV = PLL MHz */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 20000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 7 @@ -86,11 +86,11 @@ #define CONFIG_USART_ID 3
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -106,8 +106,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -118,8 +118,8 @@ * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP options @@ -145,13 +145,13 @@ #undef CONFIG_CMD_SOURCE #undef CONFIG_CMD_XIMG
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 @@ -175,7 +175,7 @@ #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE #define CONFIG_SYS_SDRAM_BASE EBI_SDRAM_BASE
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -193,7 +193,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x700000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/hammerhead.h | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 1f20fff..5a2d146 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -24,10 +24,10 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_HAMMERHEAD 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_HAMMERHEAD
#define CONFIG_SYS_HZ 1000
@@ -36,8 +36,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 25000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 5 @@ -65,11 +65,11 @@ #define CONFIG_HOSTNAME hammerhead
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -84,8 +84,8 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT 1 -#define CONFIG_AUTOBOOT_KEYED 1 +#define CONFIG_AUTOBOOT +#define CONFIG_AUTOBOOT_KEYED #define CONFIG_AUTOBOOT_PROMPT \ "Press SPACE to abort autoboot in %d seconds\n", bootdelay #define CONFIG_AUTOBOOT_DELAY_STR "d" @@ -96,8 +96,8 @@ * should be generated and assigned to the environment variables * "ethaddr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -119,21 +119,21 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_SETGETDCR
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -147,7 +147,7 @@
#define CONFIG_SYS_SDRAM_BASE 0x10000000
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -166,7 +166,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
include/configs/mimc200.h | 56 ++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index f004ec8..66b9477 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -26,12 +26,12 @@
#include <asm/arch/hardware.h>
-#define CONFIG_AVR32 1 -#define CONFIG_AT32AP 1 -#define CONFIG_AT32AP7000 1 -#define CONFIG_MIMC200 1 +#define CONFIG_AVR32 +#define CONFIG_AT32AP +#define CONFIG_AT32AP7000 +#define CONFIG_MIMC200
-#define CONFIG_MIMC200_EXT_FLASH 1 +#define CONFIG_MIMC200_EXT_FLASH
#define CONFIG_SYS_HZ 1000
@@ -40,8 +40,8 @@ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency * and the PBA bus to run at 1/4 the PLL frequency. */ -#define CONFIG_PLL 1 -#define CONFIG_SYS_POWER_MANAGER 1 +#define CONFIG_PLL +#define CONFIG_SYS_POWER_MANAGER #define CONFIG_SYS_OSC0_HZ 10000000 #define CONFIG_SYS_PLL0_DIV 1 #define CONFIG_SYS_PLL0_MUL 15 @@ -69,11 +69,11 @@ #define CONFIG_MIMC200_DBGLINK 1
/* User serviceable stuff */ -#define CONFIG_DOS_PARTITION 1 +#define CONFIG_DOS_PARTITION
-#define CONFIG_CMDLINE_TAG 1 -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG
#define CONFIG_STACKSIZE (2048)
@@ -83,9 +83,9 @@ #define CONFIG_BOOTCOMMAND \ "fsload boot/uImage; bootm"
-#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ -#define CONFIG_DISABLE_CONSOLE 1 /* disable console */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ +#define CONFIG_SILENT_CONSOLE /* enable silent startup */ +#define CONFIG_DISABLE_CONSOLE /* disable console */ +#define CONFIG_SYS_DEVICE_NULLDEV /* include nulldev device */
#define CONFIG_LCD 1
@@ -94,16 +94,16 @@ * data on the serial line may interrupt the boot sequence. */ #define CONFIG_BOOTDELAY 0 -#define CONFIG_ZERO_BOOTDELAY_CHECK 1 -#define CONFIG_AUTOBOOT 1 +#define CONFIG_ZERO_BOOTDELAY_CHECK +#define CONFIG_AUTOBOOT
/* * After booting the board for the first time, new ethernet addresses * should be generated and assigned to the environment variables * "ethaddr" and "eth1addr". This is normally done during production. */ -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_OVERWRITE_ETHADDR_ONCE +#define CONFIG_NET_MULTI
/* * BOOTP/DHCP options @@ -124,13 +124,13 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NET
-#define CONFIG_ATMEL_USART 1 -#define CONFIG_MACB 1 -#define CONFIG_PORTMUX_PIO 1 +#define CONFIG_ATMEL_USART +#define CONFIG_MACB +#define CONFIG_PORTMUX_PIO #define CONFIG_SYS_NR_PIOS 5 -#define CONFIG_SYS_HSDRAMC 1 -#define CONFIG_MMC 1 -#define CONFIG_ATMEL_MCI 1 +#define CONFIG_SYS_HSDRAMC +#define CONFIG_MMC +#define CONFIG_ATMEL_MCI
#if defined(CONFIG_LCD) #define CONFIG_CMD_BMP @@ -151,8 +151,8 @@
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x800000 @@ -168,7 +168,7 @@ #define CONFIG_SYS_FRAM_BASE 0x08000000 #define CONFIG_SYS_FRAM_SIZE 0x20000
-#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SIZE 65536 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - CONFIG_ENV_SIZE)
@@ -186,7 +186,7 @@ #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_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START EBI_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1f00000)
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
board/atmel/atngw100/config.mk | 1 - include/configs/atngw100.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atngw100/config.mk
diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/atmel/atngw100/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 70f1e8a..bda6eed 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -149,6 +149,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
board/atmel/atstk1000/config.mk | 1 - include/configs/atstk1002.h | 1 + include/configs/atstk1003.h | 1 + include/configs/atstk1004.h | 1 + include/configs/atstk1006.h | 1 + 5 files changed, 4 insertions(+), 1 deletions(-) delete mode 100644 board/atmel/atstk1000/config.mk
diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/atmel/atstk1000/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 997e9dd..c17d107 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index 9cc5cb9..a77d52e 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index a225395..cc00a0a 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -156,6 +156,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index d681929..2cff140 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -173,6 +173,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
board/earthlcd/favr-32-ezkit/config.mk | 1 - include/configs/favr-32-ezkit.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/earthlcd/favr-32-ezkit/config.mk
diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/earthlcd/favr-32-ezkit/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index f364dad..4c30b39 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -170,6 +170,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
board/mimc/mimc200/config.mk | 1 - include/configs/mimc200.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/mimc/mimc200/config.mk
diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/mimc/mimc200/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 66b9477..6c52769 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -160,6 +160,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE #define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- No changes since V1
board/miromico/hammerhead/config.mk | 1 - include/configs/hammerhead.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 board/miromico/hammerhead/config.mk
diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk deleted file mode 100644 index 34b709a..0000000 --- a/board/miromico/hammerhead/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00000000 diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 5a2d146..bfdfc0a 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -141,6 +141,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 135
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE +#define CONFIG_SYS_TEXT_BASE 0x00000000
#define CONFIG_SYS_INTRAM_BASE 0x24000000 #define CONFIG_SYS_INTRAM_SIZE 0x8000
participants (3)
-
Andreas Bießmann -
Andreas Bießmann -
Reinhard Meyer