Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/Makefile | 1 + arch/arm/boards/eukrea_cpuimx25/Makefile | 1 - .../arm/boards/eukrea_cpuimx25/flash-header.imxcfg | 16 ++++++ arch/arm/boards/eukrea_cpuimx25/flash_header.c | 61 ---------------------- 4 files changed, 17 insertions(+), 62 deletions(-) create mode 100644 arch/arm/boards/eukrea_cpuimx25/flash-header.imxcfg delete mode 100644 arch/arm/boards/eukrea_cpuimx25/flash_header.c diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d6744a6..d479e6a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -218,6 +218,7 @@ imxcfg-$(CONFIG_MACH_GUF_VINCELL) += $(boarddir)/guf-vincell/flash-header.imxcfg imxcfg-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += $(boarddir)/eukrea_cpuimx51/flash-header.imxcfg imxcfg-$(CONFIG_MACH_FREESCALE_MX25_3STACK) += $(boarddir)/freescale-mx25-3-stack/flash-header.imxcfg imxcfg-$(CONFIG_MACH_TQMA53) += $(boarddir)/tqma53/flash-header.imxcfg +imxcfg-$(CONFIG_MACH_EUKREA_CPUIMX25) += $(boarddir)/eukrea_cpuimx25/flash-header.imxcfg ifneq ($(imxcfg-y),) CFG_barebox.imximg := $(imxcfg-y) KBUILD_IMAGE := barebox.imximg diff --git a/arch/arm/boards/eukrea_cpuimx25/Makefile b/arch/arm/boards/eukrea_cpuimx25/Makefile index 203fcfb..4f08476 100644 --- a/arch/arm/boards/eukrea_cpuimx25/Makefile +++ b/arch/arm/boards/eukrea_cpuimx25/Makefile @@ -17,5 +17,4 @@ # obj-y += eukrea_cpuimx25.o -lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o lwl-y += lowlevel.o diff --git a/arch/arm/boards/eukrea_cpuimx25/flash-header.imxcfg b/arch/arm/boards/eukrea_cpuimx25/flash-header.imxcfg new file mode 100644 index 0000000..8ec9067 --- /dev/null +++ b/arch/arm/boards/eukrea_cpuimx25/flash-header.imxcfg @@ -0,0 +1,16 @@ +soc imx25 +loadaddr 0x80000000 +dcdofs 0x400 + +wm 32 0xb8001010 0x00000004 +wm 32 0xb8001000 0x92100000 +wm 8 0x80000400 0x12344321 +wm 32 0xb8001000 0xa2100000 +wm 32 0x80000000 0x12344321 +wm 32 0x80000000 0x12344321 +wm 32 0xb8001000 0xb2100000 +wm 8 0x80000033 0xda +wm 8 0x81000000 0xff +wm 32 0xb8001000 0x82216080 +wm 32 0xb8001004 0x00295729 +wm 32 0x53f80008 0x20034000 diff --git a/arch/arm/boards/eukrea_cpuimx25/flash_header.c b/arch/arm/boards/eukrea_cpuimx25/flash_header.c deleted file mode 100644 index 9102c2a..0000000 --- a/arch/arm/boards/eukrea_cpuimx25/flash_header.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * (C) 2009 Pengutronix, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> - * (c) 2010 Eukrea Electromatique, Eric Bénard <eric@xxxxxxxxxx> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - */ -#include <common.h> -#include <mach/imx-flash-header.h> -#include <mach/imx25-regs.h> -#include <asm/barebox-arm-head.h> - -void __naked __flash_header_start go(void) -{ - barebox_arm_head(); -} - -struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { - { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, - { .ptr_type = 4, .addr = 0xb8001000, .val = 0x92100000, }, - { .ptr_type = 1, .addr = 0x80000400, .val = 0x12344321, }, - { .ptr_type = 4, .addr = 0xb8001000, .val = 0xa2100000, }, - { .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, }, - { .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, }, - { .ptr_type = 4, .addr = 0xb8001000, .val = 0xb2100000, }, - { .ptr_type = 1, .addr = 0x80000033, .val = 0xda, }, - { .ptr_type = 1, .addr = 0x81000000, .val = 0xff, }, - { .ptr_type = 4, .addr = 0xb8001000, .val = 0x82216080, }, - { .ptr_type = 4, .addr = 0xb8001004, .val = 0x00295729, }, - { .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, }, -}; - -struct imx_flash_header __flash_header_section flash_header = { - .app_code_jump_vector = DEST_BASE + 0x1000, - .app_code_barker = APP_CODE_BARKER, - .app_code_csf = 0, - .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), - .super_root_key = 0, - .dcd = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = DEST_BASE, - .dcd_barker = DCD_BARKER, - .dcd_block_len = sizeof(dcd_entry), -}; - -unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE; -- 1.8.5.3 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox