mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-04 23:08:26 +02:00
add basic support for the Magicbox boards
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4672 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a5dc790f92
commit
3f494f8d22
@ -42,6 +42,9 @@ else
|
||||
ifneq (,$(findstring x86,$(BOARD)))
|
||||
KERNELNAME="bzImage"
|
||||
endif
|
||||
ifneq (,$(findstring ppc,$(BOARD)))
|
||||
KERNELNAME="uImage"
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring uml,$(BOARD)))
|
||||
LINUX_KARCH:=um
|
||||
|
@ -23,6 +23,7 @@ $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
|
||||
$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
|
||||
$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
|
||||
$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
|
||||
$(eval $(call kernel_template,2.6,magicbox,2_6_MAGICBOX))
|
||||
$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
|
||||
|
||||
export BOARD
|
||||
|
@ -32,6 +32,9 @@ endif
|
||||
ifeq ($(ARCH),armeb)
|
||||
HAL_TARGET:=xscale-be-elf
|
||||
endif
|
||||
ifeq ($(ARCH),powerpc)
|
||||
HAL_TARGET:=powerpc-be-elf
|
||||
endif
|
||||
|
||||
BUS := PCI
|
||||
ifneq ($(CONFIG_LINUX_2_4_AR531X),)
|
||||
|
@ -71,6 +71,14 @@ config LINUX_2_6_XSCALE
|
||||
select BIG_ENDIAN
|
||||
select PCI_SUPPORT
|
||||
|
||||
config LINUX_2_6_MAGICBOX
|
||||
bool "Magicbox [2.6]"
|
||||
depends BROKEN
|
||||
select powerpc
|
||||
select LINUX_2_6
|
||||
select BIG_ENDIAN
|
||||
select PCI_SUPPORT
|
||||
|
||||
config LINUX_2_6_RB532
|
||||
bool "Mikrotik RB532 [2.6]"
|
||||
select mipsel
|
||||
@ -128,13 +136,6 @@ config LINUX_2_6_M68K
|
||||
select LINUX_2_6
|
||||
select m68k
|
||||
|
||||
config LINUX_2_6_PPC
|
||||
bool "UNSUPPORTED powerpc platform"
|
||||
depends BROKEN
|
||||
select LINUX_2_6
|
||||
select BIG_ENDIAN
|
||||
select powerpc
|
||||
|
||||
config LINUX_2_6_SH3
|
||||
bool "UNSUPPORTED little-endian sh3 platform"
|
||||
depends BROKEN
|
||||
|
32
target/image/magicbox/Makefile
Normal file
32
target/image/magicbox/Makefile
Normal file
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/image.mk
|
||||
|
||||
define Build/Clean
|
||||
endef
|
||||
|
||||
define Image/Prepare
|
||||
endef
|
||||
|
||||
define Image/BuildKernel
|
||||
cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage
|
||||
endef
|
||||
|
||||
define Image/Build
|
||||
$(call Image/Build/$(1),$(1))
|
||||
endef
|
||||
|
||||
define Image/Build/jffs2-64k
|
||||
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync
|
||||
endef
|
||||
|
||||
define Image/Build/jffs2-128k
|
||||
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync
|
||||
endef
|
||||
|
||||
$(eval $(call BuildImage))
|
@ -1,3 +1,15 @@
|
||||
diff -ruN linux-2.6.15.1/include/asm-ppc/libgcc.h linux-2.6.15.1-openwrt/include/asm-ppc/libgcc.h
|
||||
--- linux-2.6.15.1/include/asm-ppc/libgcc.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.15.1-openwrt/include/asm-ppc/libgcc.h 2006-02-01 15:47:53.000000000 +0100
|
||||
@@ -0,0 +1,8 @@
|
||||
+#ifndef __ASM_LIBGCC_H
|
||||
+#define __ASM_LIBGCC_H
|
||||
+
|
||||
+#undef ARCH_NEEDS_ashldi3
|
||||
+#undef ARCH_NEEDS_ashrdi3
|
||||
+#undef ARCH_NEEDS_lshrdi3
|
||||
+
|
||||
+#endif /* __ASM_LIBGCC_H */
|
||||
diff -ruN linux-2.6.15.1/include/asm-i386/libgcc.h linux-2.6.15.1-openwrt/include/asm-i386/libgcc.h
|
||||
--- linux-2.6.15.1/include/asm-i386/libgcc.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.15.1-openwrt/include/asm-i386/libgcc.h 2006-02-01 15:47:53.000000000 +0100
|
||||
|
22
target/linux/magicbox-2.6/Makefile
Normal file
22
target/linux/magicbox-2.6/Makefile
Normal file
@ -0,0 +1,22 @@
|
||||
#
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LINUX_VERSION:=2.6.17
|
||||
LINUX_RELEASE:=1
|
||||
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
|
||||
|
||||
include ./config
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
include $(INCLUDE_DIR)/kernel-build.mk
|
||||
|
||||
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
|
||||
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
|
||||
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
|
||||
@$(CP) config $(LINUX_DIR)/.config
|
||||
touch $@
|
||||
|
1530
target/linux/magicbox-2.6/config
Normal file
1530
target/linux/magicbox-2.6/config
Normal file
File diff suppressed because it is too large
Load Diff
508
target/linux/magicbox-2.6/patches/001-magicbox_support.patch
Normal file
508
target/linux/magicbox-2.6/patches/001-magicbox_support.patch
Normal file
@ -0,0 +1,508 @@
|
||||
diff -Nur linux-2.6.17/arch/ppc/platforms/4xx/Kconfig linux-2.6.17-owrt/arch/ppc/platforms/4xx/Kconfig
|
||||
--- linux-2.6.17/arch/ppc/platforms/4xx/Kconfig 2006-06-18 03:49:35.000000000 +0200
|
||||
+++ linux-2.6.17-owrt/arch/ppc/platforms/4xx/Kconfig 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -52,6 +52,12 @@
|
||||
help
|
||||
This option enables support for the IBM PPC405GP evaluation board.
|
||||
|
||||
+config MAGICBOX
|
||||
+ bool "MagicBox"
|
||||
+ select WANT_EARLY_SERIAL
|
||||
+ help
|
||||
+ This option enables support for the IBM PPC405EP evaluation board.
|
||||
+
|
||||
config XILINX_ML300
|
||||
bool "Xilinx-ML300"
|
||||
help
|
||||
@@ -173,7 +179,7 @@
|
||||
|
||||
config IBM_OCP
|
||||
bool
|
||||
- depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
|
||||
+ depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT || MAGICBOX
|
||||
default y
|
||||
|
||||
config IBM_EMAC4
|
||||
@@ -183,7 +189,7 @@
|
||||
|
||||
config BIOS_FIXUP
|
||||
bool
|
||||
- depends on BUBINGA || EP405 || SYCAMORE || WALNUT
|
||||
+ depends on BUBINGA || EP405 || SYCAMORE || WALNUT || MAGICBOX
|
||||
default y
|
||||
|
||||
# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
|
||||
@@ -194,7 +200,7 @@
|
||||
|
||||
config 405EP
|
||||
bool
|
||||
- depends on BUBINGA
|
||||
+ depends on BUBINGA || MAGICBOX
|
||||
default y
|
||||
|
||||
config 405GP
|
||||
diff -Nur linux-2.6.17/arch/ppc/platforms/4xx/magicbox.c linux-2.6.17-owrt/arch/ppc/platforms/4xx/magicbox.c
|
||||
--- linux-2.6.17/arch/ppc/platforms/4xx/magicbox.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.17-owrt/arch/ppc/platforms/4xx/magicbox.c 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -0,0 +1,249 @@
|
||||
+/*
|
||||
+ * Support for IBM PPC 405EP-based MagicBox board
|
||||
+ * Copyright (C) 2006 Karol Lewandowski
|
||||
+ *
|
||||
+ * Heavily based on bubinga.c
|
||||
+ *
|
||||
+ * Author: SAW (IBM), derived from walnut.c.
|
||||
+ * Maintained by MontaVista Software <source@mvista.com>
|
||||
+ *
|
||||
+ * 2003 (c) MontaVista Softare Inc. This file is licensed under the
|
||||
+ * terms of the GNU General Public License version 2. This program is
|
||||
+ * licensed "as is" without any warranty of any kind, whether express
|
||||
+ * or implied.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/config.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/smp.h>
|
||||
+#include <linux/threads.h>
|
||||
+#include <linux/param.h>
|
||||
+#include <linux/string.h>
|
||||
+#include <linux/blkdev.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/serial_core.h>
|
||||
+
|
||||
+#include <asm/system.h>
|
||||
+#include <asm/pci-bridge.h>
|
||||
+#include <asm/processor.h>
|
||||
+#include <asm/machdep.h>
|
||||
+#include <asm/page.h>
|
||||
+#include <asm/time.h>
|
||||
+#include <asm/io.h>
|
||||
+#include <asm/kgdb.h>
|
||||
+#include <asm/ocp.h>
|
||||
+#include <asm/ibm_ocp_pci.h>
|
||||
+
|
||||
+#include <platforms/4xx/ibm405ep.h>
|
||||
+
|
||||
+#undef DEBUG
|
||||
+
|
||||
+#ifdef DEBUG
|
||||
+#define DBG(x...) printk(x)
|
||||
+#else
|
||||
+#define DBG(x...)
|
||||
+#endif
|
||||
+
|
||||
+extern bd_t __res;
|
||||
+
|
||||
+/* Some IRQs unique to board
|
||||
+ * Used by the generic 405 PCI setup functions in ppc4xx_pci.c
|
||||
+ */
|
||||
+int __init
|
||||
+ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
|
||||
+{
|
||||
+ static char pci_irq_table[][4] =
|
||||
+ /*
|
||||
+ * PCI IDSEL/INTPIN->INTLINE
|
||||
+ * A B C D
|
||||
+ */
|
||||
+ {
|
||||
+ {28, 28, 28, 28}, /* IDSEL 1 - PCI slot 1 */
|
||||
+ {29, 29, 29, 29}, /* IDSEL 2 - PCI slot 2 */
|
||||
+ {30, 30, 30, 30}, /* IDSEL 3 - PCI slot 3 */
|
||||
+ {31, 31, 31, 31}, /* IDSEL 4 - PCI slot 4 */
|
||||
+ };
|
||||
+
|
||||
+ const long min_idsel = 1, max_idsel = 4, irqs_per_slot = 4;
|
||||
+ return PCI_IRQ_TABLE_LOOKUP;
|
||||
+};
|
||||
+
|
||||
+
|
||||
+/* The serial clock for the chip is an internal clock determined by
|
||||
+ * different clock speeds/dividers.
|
||||
+ * Calculate the proper input baud rate and setup the serial driver.
|
||||
+ */
|
||||
+static void __init
|
||||
+magicbox_early_serial_map(void)
|
||||
+{
|
||||
+ u32 uart_div;
|
||||
+ int uart_clock;
|
||||
+ struct uart_port port;
|
||||
+
|
||||
+ /* Calculate the serial clock input frequency
|
||||
+ *
|
||||
+ * The base baud is the PLL OUTA (provided in the board info
|
||||
+ * structure) divided by the external UART Divisor, divided
|
||||
+ * by 16.
|
||||
+ */
|
||||
+ uart_div = (mfdcr(DCRN_CPC0_UCR_BASE) & DCRN_CPC0_UCR_U0DIV);
|
||||
+ uart_clock = __res.bi_procfreq / uart_div;
|
||||
+
|
||||
+ /* Setup serial port access */
|
||||
+ memset(&port, 0, sizeof(port));
|
||||
+ port.membase = (void*)ACTING_UART0_IO_BASE;
|
||||
+ port.irq = ACTING_UART0_INT;
|
||||
+ port.uartclk = uart_clock;
|
||||
+ port.regshift = 0;
|
||||
+ port.iotype = SERIAL_IO_MEM;
|
||||
+ port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
|
||||
+ port.line = 0;
|
||||
+
|
||||
+ if (early_serial_setup(&port) != 0) {
|
||||
+ printk("Early serial init of port 0 failed\n");
|
||||
+ }
|
||||
+
|
||||
+ port.membase = (void*)ACTING_UART1_IO_BASE;
|
||||
+ port.irq = ACTING_UART1_INT;
|
||||
+ port.line = 1;
|
||||
+
|
||||
+ if (early_serial_setup(&port) != 0) {
|
||||
+ printk("Early serial init of port 1 failed\n");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void __init
|
||||
+bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
|
||||
+{
|
||||
+ unsigned int bar_response, bar;
|
||||
+ /*
|
||||
+ * Expected PCI mapping:
|
||||
+ *
|
||||
+ * PLB addr PCI memory addr
|
||||
+ * --------------------- ---------------------
|
||||
+ * 0000'0000 - 7fff'ffff <--- 0000'0000 - 7fff'ffff
|
||||
+ * 8000'0000 - Bfff'ffff ---> 8000'0000 - Bfff'ffff
|
||||
+ *
|
||||
+ * PLB addr PCI io addr
|
||||
+ * --------------------- ---------------------
|
||||
+ * e800'0000 - e800'ffff ---> 0000'0000 - 0001'0000
|
||||
+ *
|
||||
+ * The following code is simplified by assuming that the bootrom
|
||||
+ * has been well behaved in following this mapping.
|
||||
+ */
|
||||
+
|
||||
+#ifdef DEBUG
|
||||
+ int i;
|
||||
+
|
||||
+ printk("ioremap PCLIO_BASE = 0x%x\n", pcip);
|
||||
+ printk("PCI bridge regs before fixup \n");
|
||||
+ for (i = 0; i <= 3; i++) {
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pcila)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pciha)));
|
||||
+ }
|
||||
+ printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms)));
|
||||
+ printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la)));
|
||||
+ printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
|
||||
+ printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+ /* added for IBM boot rom version 1.15 bios bar changes -AK */
|
||||
+
|
||||
+ /* Disable region first */
|
||||
+ out_le32((void *) &(pcip->pmm[0].ma), 0x00000000);
|
||||
+ /* PLB starting addr, PCI: 0x80000000 */
|
||||
+ out_le32((void *) &(pcip->pmm[0].la), 0x80000000);
|
||||
+ /* PCI start addr, 0x80000000 */
|
||||
+ out_le32((void *) &(pcip->pmm[0].pcila), PPC405_PCI_MEM_BASE);
|
||||
+ /* 512MB range of PLB to PCI */
|
||||
+ out_le32((void *) &(pcip->pmm[0].pciha), 0x00000000);
|
||||
+ /* Enable no pre-fetch, enable region */
|
||||
+ out_le32((void *) &(pcip->pmm[0].ma), ((0xffffffff -
|
||||
+ (PPC405_PCI_UPPER_MEM -
|
||||
+ PPC405_PCI_MEM_BASE)) | 0x01));
|
||||
+
|
||||
+ /* Disable region one */
|
||||
+ out_le32((void *) &(pcip->pmm[1].ma), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[1].la), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[1].pcila), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[1].pciha), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[1].ma), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->ptm1ms), 0x00000001);
|
||||
+
|
||||
+ /* Disable region two */
|
||||
+ out_le32((void *) &(pcip->pmm[2].ma), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[2].la), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[2].pcila), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[2].pciha), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->pmm[2].ma), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->ptm2ms), 0x00000000);
|
||||
+ out_le32((void *) &(pcip->ptm2la), 0x00000000);
|
||||
+
|
||||
+ /* Zero config bars */
|
||||
+ for (bar = PCI_BASE_ADDRESS_1; bar <= PCI_BASE_ADDRESS_2; bar += 4) {
|
||||
+ early_write_config_dword(hose, hose->first_busno,
|
||||
+ PCI_FUNC(hose->first_busno), bar,
|
||||
+ 0x00000000);
|
||||
+ early_read_config_dword(hose, hose->first_busno,
|
||||
+ PCI_FUNC(hose->first_busno), bar,
|
||||
+ &bar_response);
|
||||
+ DBG("BUS %d, device %d, Function %d bar 0x%8.8x is 0x%8.8x\n",
|
||||
+ hose->first_busno, PCI_SLOT(hose->first_busno),
|
||||
+ PCI_FUNC(hose->first_busno), bar, bar_response);
|
||||
+ }
|
||||
+ /* end work arround */
|
||||
+
|
||||
+#ifdef DEBUG
|
||||
+ printk("PCI bridge regs after fixup \n");
|
||||
+ for (i = 0; i <= 3; i++) {
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pcila)));
|
||||
+ printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].pciha)));
|
||||
+ }
|
||||
+ printk(" ptm1ms\t0x%x\n", in_le32(&(pcip->ptm1ms)));
|
||||
+ printk(" ptm1la\t0x%x\n", in_le32(&(pcip->ptm1la)));
|
||||
+ printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
|
||||
+ printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
|
||||
+
|
||||
+#endif /* DEBUG */
|
||||
+}
|
||||
+
|
||||
+void __init
|
||||
+magicbox_setup_arch(void)
|
||||
+{
|
||||
+ ppc4xx_setup_arch();
|
||||
+
|
||||
+ ibm_ocp_set_emac(0, 1);
|
||||
+
|
||||
+ magicbox_early_serial_map();
|
||||
+
|
||||
+ /* Identify the system */
|
||||
+ printk("MagicBox port (C) 2005 Karol Lewandowski <kl@jasmine.eu.org>\n");
|
||||
+}
|
||||
+
|
||||
+void __init
|
||||
+magicbox_map_io(void)
|
||||
+{
|
||||
+ ppc4xx_map_io();
|
||||
+}
|
||||
+
|
||||
+void __init
|
||||
+platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
|
||||
+ unsigned long r6, unsigned long r7)
|
||||
+{
|
||||
+ ppc4xx_init(r3, r4, r5, r6, r7);
|
||||
+
|
||||
+ ppc_md.setup_arch = magicbox_setup_arch;
|
||||
+ ppc_md.setup_io_mappings = magicbox_map_io;
|
||||
+
|
||||
+#ifdef CONFIG_KGDB
|
||||
+ ppc_md.early_serial_map = bubinga_early_serial_map;
|
||||
+#endif
|
||||
+
|
||||
+}
|
||||
diff -Nur linux-2.6.17/arch/ppc/platforms/4xx/magicbox.h linux-2.6.17-owrt/arch/ppc/platforms/4xx/magicbox.h
|
||||
--- linux-2.6.17/arch/ppc/platforms/4xx/magicbox.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.17-owrt/arch/ppc/platforms/4xx/magicbox.h 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -0,0 +1,47 @@
|
||||
+/*
|
||||
+ * Support for IBM PPC 405EP-based MagicBox board
|
||||
+ *
|
||||
+ * Heavily based on bubinga.h
|
||||
+ *
|
||||
+ *
|
||||
+ * Author: SAW (IBM), derived from walnut.h.
|
||||
+ * Maintained by MontaVista Software <source@mvista.com>
|
||||
+ *
|
||||
+ * 2003 (c) MontaVista Softare Inc. This file is licensed under the
|
||||
+ * terms of the GNU General Public License version 2. This program is
|
||||
+ * licensed "as is" without any warranty of any kind, whether express
|
||||
+ * or implied.
|
||||
+ */
|
||||
+
|
||||
+#ifdef __KERNEL__
|
||||
+#ifndef __MAGICBOX_H__
|
||||
+#define __MAGICBOX_H__
|
||||
+
|
||||
+#include <linux/config.h>
|
||||
+#include <platforms/4xx/ibm405ep.h>
|
||||
+#include <asm/ppcboot.h>
|
||||
+
|
||||
+/* Memory map for the "MagicBox" 405EP evaluation board -- generic 4xx. */
|
||||
+
|
||||
+/* The UART clock is based off an internal clock -
|
||||
+ * define BASE_BAUD based on the internal clock and divider(s).
|
||||
+ * Since BASE_BAUD must be a constant, we will initialize it
|
||||
+ * using clock/divider values which OpenBIOS initializes
|
||||
+ * for typical configurations at various CPU speeds.
|
||||
+ * The base baud is calculated as (FWDA / EXT UART DIV / 16)
|
||||
+ */
|
||||
+#define BASE_BAUD 0
|
||||
+
|
||||
+/* Flash */
|
||||
+#define PPC40x_FPGA_BASE 0xF0300000
|
||||
+#define PPC40x_FPGA_REG_OFFS 1 /* offset to flash map reg */
|
||||
+#define PPC40x_FLASH_ONBD_N(x) (x & 0x02)
|
||||
+#define PPC40x_FLASH_SRAM_SEL(x) (x & 0x01)
|
||||
+#define PPC40x_FLASH_LOW 0xFFF00000
|
||||
+#define PPC40x_FLASH_HIGH 0xFFF80000
|
||||
+#define PPC40x_FLASH_SIZE 0x80000
|
||||
+
|
||||
+#define PPC4xx_MACHINE_NAME "MagicBox"
|
||||
+
|
||||
+#endif /* __MAGICBOX_H__ */
|
||||
+#endif /* __KERNEL__ */
|
||||
diff -Nur linux-2.6.17/arch/ppc/platforms/4xx/Makefile linux-2.6.17-owrt/arch/ppc/platforms/4xx/Makefile
|
||||
--- linux-2.6.17/arch/ppc/platforms/4xx/Makefile 2006-06-18 03:49:35.000000000 +0200
|
||||
+++ linux-2.6.17-owrt/arch/ppc/platforms/4xx/Makefile 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
obj-$(CONFIG_REDWOOD_6) += redwood6.o
|
||||
obj-$(CONFIG_SYCAMORE) += sycamore.o
|
||||
obj-$(CONFIG_WALNUT) += walnut.o
|
||||
+obj-$(CONFIG_MAGICBOX) += magicbox.o
|
||||
obj-$(CONFIG_XILINX_ML300) += xilinx_ml300.o
|
||||
obj-$(CONFIG_XILINX_ML403) += xilinx_ml403.o
|
||||
|
||||
diff -Nur linux-2.6.17/drivers/mtd/maps/Kconfig linux-2.6.17-owrt/drivers/mtd/maps/Kconfig
|
||||
--- linux-2.6.17/drivers/mtd/maps/Kconfig 2006-06-18 03:49:35.000000000 +0200
|
||||
+++ linux-2.6.17-owrt/drivers/mtd/maps/Kconfig 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -323,6 +323,15 @@
|
||||
Walnut board. If you have one of these boards and would like to
|
||||
use the flash chips on it, say 'Y'.
|
||||
|
||||
+config MTD_MAGICMAP
|
||||
+ tristate "Flash device mapped on IBM 405EP MagicBox"
|
||||
+ depends on MTD_CFI && MTD_PARTITIONS && 40x && MAGICBOX
|
||||
+ help
|
||||
+ This enables access routines for the flash chips on the IBM 405EP
|
||||
+ MagicBox board. If you have one of these boards and would like to
|
||||
+ use the flash chips on it, say 'Y'.
|
||||
+
|
||||
+
|
||||
config MTD_EBONY
|
||||
tristate "Flash devices mapped on IBM 440GP Ebony"
|
||||
depends on MTD_JEDECPROBE && EBONY
|
||||
diff -Nur linux-2.6.17/drivers/mtd/maps/magicmap.c linux-2.6.17-owrt/drivers/mtd/maps/magicmap.c
|
||||
--- linux-2.6.17/drivers/mtd/maps/magicmap.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.6.17-owrt/drivers/mtd/maps/magicmap.c 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -0,0 +1,102 @@
|
||||
+/*
|
||||
+ * magicmap.c: Copyleft 2005 Karol Lewandowski
|
||||
+ *
|
||||
+ * Mapping for MagicBox flash.
|
||||
+ * Based on walnut.c.
|
||||
+ *
|
||||
+ * Heikki Lindholm <holindho@infradead.org>
|
||||
+ *
|
||||
+ *
|
||||
+ * 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.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/mtd/mtd.h>
|
||||
+#include <linux/mtd/map.h>
|
||||
+#include <linux/mtd/partitions.h>
|
||||
+#include <linux/config.h>
|
||||
+#include <asm/io.h>
|
||||
+
|
||||
+static struct mtd_info *flash;
|
||||
+
|
||||
+static struct map_info magic_map = {
|
||||
+ .name = "Magically mapped flash",
|
||||
+ .phys = 0xffc00000,
|
||||
+ .size = 0x400000,
|
||||
+ .bankwidth = 2,
|
||||
+};
|
||||
+
|
||||
+static struct mtd_partition magic_partitions[] = {
|
||||
+ {
|
||||
+ .name = "kernel",
|
||||
+ .offset = 0x0,
|
||||
+ .size = 0x0e0000,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "ramdisk",
|
||||
+ .offset = 0x0e0000,
|
||||
+ .size = 0x2c0000,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "persistent",
|
||||
+ .offset = 0x3a0000,
|
||||
+ .size = 0x020000,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "bootloader",
|
||||
+ .offset = 0x3c0000,
|
||||
+ .size = 0x040000,
|
||||
+ .mask_flags = MTD_WRITEABLE,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+int __init init_magic(void)
|
||||
+{
|
||||
+ magic_map.virt =
|
||||
+ (void __iomem *)ioremap(magic_map.phys, magic_map.size);
|
||||
+
|
||||
+ if (!magic_map.virt) {
|
||||
+ printk("Failed to ioremap flash.\n");
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+
|
||||
+ simple_map_init(&magic_map);
|
||||
+
|
||||
+ flash = do_map_probe("cfi_probe", &magic_map);
|
||||
+ if (flash) {
|
||||
+ flash->owner = THIS_MODULE;
|
||||
+ add_mtd_partitions(flash, magic_partitions,
|
||||
+ ARRAY_SIZE(magic_partitions));
|
||||
+ } else {
|
||||
+ printk("map probe failed for flash\n");
|
||||
+ return -ENXIO;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void __exit cleanup_magic(void)
|
||||
+{
|
||||
+ if (flash) {
|
||||
+ del_mtd_partitions(flash);
|
||||
+ map_destroy(flash);
|
||||
+ }
|
||||
+
|
||||
+ if (magic_map.virt) {
|
||||
+ iounmap((void *)magic_map.virt);
|
||||
+ magic_map.virt = NULL;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+module_init(init_magic);
|
||||
+module_exit(cleanup_magic);
|
||||
+
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_AUTHOR("Karol Lewandowski");
|
||||
+MODULE_DESCRIPTION("MTD map and partitions for IBM 405EP MagicBox boards");
|
||||
diff -Nur linux-2.6.17/drivers/mtd/maps/Makefile linux-2.6.17-owrt/drivers/mtd/maps/Makefile
|
||||
--- linux-2.6.17/drivers/mtd/maps/Makefile 2006-06-18 03:49:35.000000000 +0200
|
||||
+++ linux-2.6.17-owrt/drivers/mtd/maps/Makefile 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -58,6 +58,7 @@
|
||||
obj-$(CONFIG_MTD_BEECH) += beech-mtd.o
|
||||
obj-$(CONFIG_MTD_ARCTIC) += arctic-mtd.o
|
||||
obj-$(CONFIG_MTD_WALNUT) += walnut.o
|
||||
+obj-$(CONFIG_MTD_MAGICMAP) += magicmap.o
|
||||
obj-$(CONFIG_MTD_H720X) += h720x-flash.o
|
||||
obj-$(CONFIG_MTD_SBC8240) += sbc8240.o
|
||||
obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o
|
||||
diff -Nur linux-2.6.17/include/asm-ppc/ibm4xx.h linux-2.6.17-owrt/include/asm-ppc/ibm4xx.h
|
||||
--- linux-2.6.17/include/asm-ppc/ibm4xx.h 2006-06-18 03:49:35.000000000 +0200
|
||||
+++ linux-2.6.17-owrt/include/asm-ppc/ibm4xx.h 2006-08-25 23:33:05.000000000 +0200
|
||||
@@ -19,6 +19,10 @@
|
||||
|
||||
#ifdef CONFIG_40x
|
||||
|
||||
+#if defined(CONFIG_MAGICBOX)
|
||||
+#include <platforms/4xx/magicbox.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(CONFIG_BUBINGA)
|
||||
#include <platforms/4xx/bubinga.h>
|
||||
#endif
|
@ -11,7 +11,7 @@ TARGETS-y:=sed kernel-headers sstrip
|
||||
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
||||
TARGETS-y+=binutils gcc uClibc
|
||||
endif
|
||||
TARGETS-y+=ipkg-utils libnotimpl ext2fs squashfs jffs2 lzma
|
||||
TARGETS-y+=ipkg-utils libnotimpl ext2fs squashfs jffs2 lzma mkimage
|
||||
|
||||
TARGETS-$(CONFIG_GDB) += gdb
|
||||
|
||||
|
341
toolchain/kernel-headers/files/config.ppc
Normal file
341
toolchain/kernel-headers/files/config.ppc
Normal file
@ -0,0 +1,341 @@
|
||||
#
|
||||
# Automatically generated by make menuconfig: don't edit
|
||||
#
|
||||
# CONFIG_UID16 is not set
|
||||
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
|
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
|
||||
#
|
||||
# Code maturity level options
|
||||
#
|
||||
# CONFIG_EXPERIMENTAL is not set
|
||||
# CONFIG_ADVANCED_OPTIONS is not set
|
||||
|
||||
#
|
||||
# Loadable module support
|
||||
#
|
||||
# CONFIG_MODULES is not set
|
||||
|
||||
#
|
||||
# Platform support
|
||||
#
|
||||
CONFIG_PPC=y
|
||||
CONFIG_PPC32=y
|
||||
# CONFIG_6xx is not set
|
||||
CONFIG_40x=y
|
||||
# CONFIG_44x is not set
|
||||
# CONFIG_POWER3 is not set
|
||||
# CONFIG_POWER4 is not set
|
||||
# CONFIG_8xx is not set
|
||||
CONFIG_4xx=y
|
||||
# CONFIG_CPCI405 is not set
|
||||
# CONFIG_EP405 is not set
|
||||
# CONFIG_REDWOOD_5 is not set
|
||||
# CONFIG_REDWOOD_6 is not set
|
||||
# CONFIG_OAK is not set
|
||||
CONFIG_WALNUT=y
|
||||
# CONFIG_SMP is not set
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
CONFIG_NOT_COHERENT_CACHE=y
|
||||
CONFIG_UART0_TTYS0=y
|
||||
# CONFIG_UART0_TTYS1 is not set
|
||||
CONFIG_405GP=y
|
||||
CONFIG_IBM_OCP=y
|
||||
CONFIG_PPC_OCP=y
|
||||
CONFIG_405=y
|
||||
CONFIG_IBM405_ERR51=y
|
||||
CONFIG_IBM405_ERR77=y
|
||||
# CONFIG_PPC4xx_DMA is not set
|
||||
CONFIG_IBM_OPENBIOS=y
|
||||
CONFIG_BIOS_FIXUP=y
|
||||
|
||||
#
|
||||
# General setup
|
||||
#
|
||||
# CONFIG_HIGHMEM is not set
|
||||
CONFIG_HIGHMEM_START=0xfe000000
|
||||
CONFIG_LOWMEM_SIZE=0x30000000
|
||||
CONFIG_KERNEL_START=0xc0000000
|
||||
CONFIG_TASK_SIZE=0x80000000
|
||||
# CONFIG_ISA is not set
|
||||
# CONFIG_EISA is not set
|
||||
# CONFIG_SBUS is not set
|
||||
# CONFIG_MCA is not set
|
||||
# CONFIG_PCI is not set
|
||||
# CONFIG_PC_KEYBOARD is not set
|
||||
# CONFIG_NET is not set
|
||||
# CONFIG_SYSCTL is not set
|
||||
# CONFIG_SYSVIPC is not set
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
CONFIG_BINFMT_ELF=y
|
||||
CONFIG_KERNEL_ELF=y
|
||||
# CONFIG_BINFMT_MISC is not set
|
||||
# CONFIG_OOM_KILLER is not set
|
||||
# CONFIG_HOTPLUG is not set
|
||||
# CONFIG_PCMCIA is not set
|
||||
|
||||
#
|
||||
# Parallel port support
|
||||
#
|
||||
# CONFIG_PARPORT is not set
|
||||
# CONFIG_GEN_RTC is not set
|
||||
# CONFIG_PPC_RTC is not set
|
||||
# CONFIG_CMDLINE_BOOL is not set
|
||||
|
||||
#
|
||||
# Memory Technology Devices (MTD)
|
||||
#
|
||||
# CONFIG_MTD is not set
|
||||
|
||||
#
|
||||
# Plug and Play configuration
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
# CONFIG_ISAPNP is not set
|
||||
|
||||
#
|
||||
# Block devices
|
||||
#
|
||||
# CONFIG_BLK_DEV_FD is not set
|
||||
# CONFIG_BLK_DEV_XD is not set
|
||||
# CONFIG_PARIDE is not set
|
||||
# CONFIG_BLK_CPQ_DA is not set
|
||||
# CONFIG_BLK_CPQ_CISS_DA is not set
|
||||
# CONFIG_CISS_SCSI_TAPE is not set
|
||||
# CONFIG_CISS_MONITOR_THREAD is not set
|
||||
# CONFIG_BLK_DEV_DAC960 is not set
|
||||
# CONFIG_BLK_DEV_UMEM is not set
|
||||
# CONFIG_BLK_DEV_SX8 is not set
|
||||
# CONFIG_BLK_DEV_LOOP is not set
|
||||
# CONFIG_BLK_DEV_NBD is not set
|
||||
# CONFIG_BLK_DEV_RAM is not set
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
# CONFIG_BLK_STATS is not set
|
||||
|
||||
#
|
||||
# Multi-device support (RAID and LVM)
|
||||
#
|
||||
# CONFIG_MD is not set
|
||||
# CONFIG_BLK_DEV_MD is not set
|
||||
# CONFIG_MD_LINEAR is not set
|
||||
# CONFIG_MD_RAID0 is not set
|
||||
# CONFIG_MD_RAID1 is not set
|
||||
# CONFIG_MD_RAID5 is not set
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_BLK_DEV_LVM is not set
|
||||
|
||||
#
|
||||
# ATA/IDE/MFM/RLL support
|
||||
#
|
||||
# CONFIG_IDE is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI support
|
||||
#
|
||||
# CONFIG_SCSI is not set
|
||||
|
||||
#
|
||||
# Amateur Radio support
|
||||
#
|
||||
# CONFIG_HAMRADIO is not set
|
||||
|
||||
#
|
||||
# ISDN subsystem
|
||||
#
|
||||
# CONFIG_ISDN is not set
|
||||
|
||||
#
|
||||
# Old CD-ROM drivers (not SCSI, not IDE)
|
||||
#
|
||||
# CONFIG_CD_NO_IDESCSI is not set
|
||||
|
||||
#
|
||||
# Console drivers
|
||||
#
|
||||
|
||||
#
|
||||
# Frame-buffer support
|
||||
#
|
||||
# CONFIG_FB is not set
|
||||
|
||||
#
|
||||
# Input core support
|
||||
#
|
||||
# CONFIG_INPUT is not set
|
||||
# CONFIG_INPUT_KEYBDEV is not set
|
||||
# CONFIG_INPUT_MOUSEDEV is not set
|
||||
# CONFIG_INPUT_JOYDEV is not set
|
||||
# CONFIG_INPUT_EVDEV is not set
|
||||
# CONFIG_INPUT_UINPUT is not set
|
||||
|
||||
#
|
||||
# Macintosh device drivers
|
||||
#
|
||||
|
||||
#
|
||||
# Character devices
|
||||
#
|
||||
# CONFIG_VT is not set
|
||||
# CONFIG_SERIAL is not set
|
||||
# CONFIG_SERIAL_EXTENDED is not set
|
||||
# CONFIG_SERIAL_NONSTANDARD is not set
|
||||
# CONFIG_UNIX98_PTYS is not set
|
||||
|
||||
#
|
||||
# I2C support
|
||||
#
|
||||
# CONFIG_I2C is not set
|
||||
|
||||
#
|
||||
# Mice
|
||||
#
|
||||
# CONFIG_BUSMOUSE is not set
|
||||
# CONFIG_MOUSE is not set
|
||||
|
||||
#
|
||||
# Joysticks
|
||||
#
|
||||
# CONFIG_INPUT_GAMEPORT is not set
|
||||
# CONFIG_QIC02_TAPE is not set
|
||||
# CONFIG_IPMI_HANDLER is not set
|
||||
# CONFIG_IPMI_PANIC_EVENT is not set
|
||||
# CONFIG_IPMI_DEVICE_INTERFACE is not set
|
||||
# CONFIG_IPMI_KCS is not set
|
||||
# CONFIG_IPMI_WATCHDOG is not set
|
||||
|
||||
#
|
||||
# Watchdog Cards
|
||||
#
|
||||
# CONFIG_WATCHDOG is not set
|
||||
# CONFIG_SCx200 is not set
|
||||
# CONFIG_SCx200_GPIO is not set
|
||||
# CONFIG_AMD_PM768 is not set
|
||||
# CONFIG_NVRAM is not set
|
||||
# CONFIG_RTC is not set
|
||||
# CONFIG_DTLK is not set
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_APPLICOM is not set
|
||||
|
||||
#
|
||||
# Ftape, the floppy tape device driver
|
||||
#
|
||||
# CONFIG_FTAPE is not set
|
||||
# CONFIG_AGP is not set
|
||||
|
||||
#
|
||||
# Direct Rendering Manager (XFree86 DRI support)
|
||||
#
|
||||
# CONFIG_DRM is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
#
|
||||
# CONFIG_VIDEO_DEV is not set
|
||||
|
||||
#
|
||||
# File systems
|
||||
#
|
||||
# CONFIG_QUOTA is not set
|
||||
# CONFIG_QFMT_V2 is not set
|
||||
# CONFIG_AUTOFS_FS is not set
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
# CONFIG_REISERFS_FS is not set
|
||||
# CONFIG_REISERFS_CHECK is not set
|
||||
# CONFIG_REISERFS_PROC_INFO is not set
|
||||
# CONFIG_ADFS_FS is not set
|
||||
# CONFIG_ADFS_FS_RW is not set
|
||||
# CONFIG_AFFS_FS is not set
|
||||
# CONFIG_HFS_FS is not set
|
||||
# CONFIG_HFSPLUS_FS is not set
|
||||
# CONFIG_BEFS_FS is not set
|
||||
# CONFIG_BEFS_DEBUG is not set
|
||||
# CONFIG_BFS_FS is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
# CONFIG_JBD is not set
|
||||
# CONFIG_JBD_DEBUG is not set
|
||||
# CONFIG_FAT_FS is not set
|
||||
# CONFIG_MSDOS_FS is not set
|
||||
# CONFIG_UMSDOS_FS is not set
|
||||
# CONFIG_VFAT_FS is not set
|
||||
# CONFIG_EFS_FS is not set
|
||||
# CONFIG_JFFS_FS is not set
|
||||
# CONFIG_JFFS2_FS is not set
|
||||
# CONFIG_CRAMFS is not set
|
||||
# CONFIG_TMPFS is not set
|
||||
CONFIG_RAMFS=y
|
||||
# CONFIG_ISO9660_FS is not set
|
||||
# CONFIG_JOLIET is not set
|
||||
# CONFIG_ZISOFS is not set
|
||||
# CONFIG_JFS_FS is not set
|
||||
# CONFIG_JFS_DEBUG is not set
|
||||
# CONFIG_JFS_STATISTICS is not set
|
||||
# CONFIG_MINIX_FS is not set
|
||||
# CONFIG_VXFS_FS is not set
|
||||
# CONFIG_NTFS_FS is not set
|
||||
# CONFIG_NTFS_RW is not set
|
||||
# CONFIG_HPFS_FS is not set
|
||||
# CONFIG_PROC_FS is not set
|
||||
# CONFIG_DEVFS_FS is not set
|
||||
# CONFIG_DEVFS_MOUNT is not set
|
||||
# CONFIG_DEVFS_DEBUG is not set
|
||||
# CONFIG_DEVPTS_FS is not set
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_QNX4FS_RW is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_SYSV_FS is not set
|
||||
# CONFIG_UDF_FS is not set
|
||||
# CONFIG_UDF_RW is not set
|
||||
# CONFIG_UFS_FS is not set
|
||||
# CONFIG_UFS_FS_WRITE is not set
|
||||
# CONFIG_XFS_FS is not set
|
||||
# CONFIG_XFS_QUOTA is not set
|
||||
# CONFIG_XFS_RT is not set
|
||||
# CONFIG_XFS_TRACE is not set
|
||||
# CONFIG_XFS_DEBUG is not set
|
||||
# CONFIG_NCPFS_NLS is not set
|
||||
# CONFIG_SMB_FS is not set
|
||||
# CONFIG_ZISOFS_FS is not set
|
||||
|
||||
#
|
||||
# Partition Types
|
||||
#
|
||||
# CONFIG_PARTITION_ADVANCED is not set
|
||||
CONFIG_MSDOS_PARTITION=y
|
||||
# CONFIG_SMB_NLS is not set
|
||||
# CONFIG_NLS is not set
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
#
|
||||
# CONFIG_USB is not set
|
||||
|
||||
#
|
||||
# Support for USB gadgets
|
||||
#
|
||||
# CONFIG_USB_GADGET is not set
|
||||
|
||||
#
|
||||
# Cryptographic options
|
||||
#
|
||||
# CONFIG_CRYPTO is not set
|
||||
|
||||
#
|
||||
# Library routines
|
||||
#
|
||||
# CONFIG_CRC32 is not set
|
||||
# CONFIG_ZLIB_INFLATE is not set
|
||||
# CONFIG_ZLIB_DEFLATE is not set
|
||||
|
||||
#
|
||||
# Kernel hacking
|
||||
#
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_LOG_BUF_SHIFT=0
|
26
toolchain/mkimage/Makefile
Normal file
26
toolchain/mkimage/Makefile
Normal file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/mkimage
|
||||
|
||||
define Build/Compile
|
||||
$(CC) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o
|
||||
$(CC) -O -c src/mkimage.c -o $(PKG_BUILD_DIR)/mkimage.o
|
||||
$(CC) -O -o $(PKG_BUILD_DIR)/mkimage $(PKG_BUILD_DIR)/mkimage.o $(PKG_BUILD_DIR)/crc32.o
|
||||
endef
|
||||
|
||||
define Build/Install
|
||||
$(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin
|
||||
endef
|
||||
|
||||
define Build/Clean
|
||||
rm -f $(STAGING_DIR)/bin/mkimage
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
197
toolchain/mkimage/src/crc32.c
Normal file
197
toolchain/mkimage/src/crc32.c
Normal file
@ -0,0 +1,197 @@
|
||||
/*
|
||||
* This file is derived from crc32.c from the zlib-1.1.3 distribution
|
||||
* by Jean-loup Gailly and Mark Adler.
|
||||
*/
|
||||
|
||||
/* crc32.c -- compute the CRC-32 of a data stream
|
||||
* Copyright (C) 1995-1998 Mark Adler
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
#define USE_HOSTCC
|
||||
#ifndef USE_HOSTCC /* Shut down "ANSI does not permit..." warnings */
|
||||
#include <common.h> /* to get command definitions like CFG_CMD_JFFS2 */
|
||||
#endif
|
||||
|
||||
#include "zlib.h"
|
||||
|
||||
#define local static
|
||||
#define ZEXPORT /* empty */
|
||||
unsigned long crc32 (unsigned long, const unsigned char *, unsigned int);
|
||||
|
||||
#ifdef DYNAMIC_CRC_TABLE
|
||||
|
||||
local int crc_table_empty = 1;
|
||||
local uLongf crc_table[256];
|
||||
local void make_crc_table OF((void));
|
||||
|
||||
/*
|
||||
Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
|
||||
x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
|
||||
|
||||
Polynomials over GF(2) are represented in binary, one bit per coefficient,
|
||||
with the lowest powers in the most significant bit. Then adding polynomials
|
||||
is just exclusive-or, and multiplying a polynomial by x is a right shift by
|
||||
one. If we call the above polynomial p, and represent a byte as the
|
||||
polynomial q, also with the lowest power in the most significant bit (so the
|
||||
byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
|
||||
where a mod b means the remainder after dividing a by b.
|
||||
|
||||
This calculation is done using the shift-register method of multiplying and
|
||||
taking the remainder. The register is initialized to zero, and for each
|
||||
incoming bit, x^32 is added mod p to the register if the bit is a one (where
|
||||
x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
|
||||
x (which is shifting right by one and adding x^32 mod p if the bit shifted
|
||||
out is a one). We start with the highest power (least significant bit) of
|
||||
q and repeat for all eight bits of q.
|
||||
|
||||
The table is simply the CRC of all possible eight bit values. This is all
|
||||
the information needed to generate CRC's on data a byte at a time for all
|
||||
combinations of CRC register values and incoming bytes.
|
||||
*/
|
||||
local void make_crc_table()
|
||||
{
|
||||
uLong c;
|
||||
int n, k;
|
||||
uLong poly; /* polynomial exclusive-or pattern */
|
||||
/* terms of polynomial defining this crc (except x^32): */
|
||||
static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
|
||||
|
||||
/* make exclusive-or pattern from polynomial (0xedb88320L) */
|
||||
poly = 0L;
|
||||
for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
|
||||
poly |= 1L << (31 - p[n]);
|
||||
|
||||
for (n = 0; n < 256; n++)
|
||||
{
|
||||
c = (uLong)n;
|
||||
for (k = 0; k < 8; k++)
|
||||
c = c & 1 ? poly ^ (c >> 1) : c >> 1;
|
||||
crc_table[n] = c;
|
||||
}
|
||||
crc_table_empty = 0;
|
||||
}
|
||||
#else
|
||||
/* ========================================================================
|
||||
* Table of CRC-32's of all single-byte values (made by make_crc_table)
|
||||
*/
|
||||
local const uLongf crc_table[256] = {
|
||||
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
|
||||
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
|
||||
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
|
||||
0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
|
||||
0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
|
||||
0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
|
||||
0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
|
||||
0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
|
||||
0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
|
||||
0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
|
||||
0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
|
||||
0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
|
||||
0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
|
||||
0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
|
||||
0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
|
||||
0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
|
||||
0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
|
||||
0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
|
||||
0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
|
||||
0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
|
||||
0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
|
||||
0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
|
||||
0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
|
||||
0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
|
||||
0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
|
||||
0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
|
||||
0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
|
||||
0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
|
||||
0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
|
||||
0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
|
||||
0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
|
||||
0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
|
||||
0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
|
||||
0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
|
||||
0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
|
||||
0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
|
||||
0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
|
||||
0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
|
||||
0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
|
||||
0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
|
||||
0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
|
||||
0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
|
||||
0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
|
||||
0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
|
||||
0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
|
||||
0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
|
||||
0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
|
||||
0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
|
||||
0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
|
||||
0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
|
||||
0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
|
||||
0x2d02ef8dL
|
||||
};
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/* =========================================================================
|
||||
* This function can be used by asm versions of crc32()
|
||||
*/
|
||||
const uLongf * ZEXPORT get_crc_table()
|
||||
{
|
||||
#ifdef DYNAMIC_CRC_TABLE
|
||||
if (crc_table_empty) make_crc_table();
|
||||
#endif
|
||||
return (const uLongf *)crc_table;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* ========================================================================= */
|
||||
#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
|
||||
#define DO2(buf) DO1(buf); DO1(buf);
|
||||
#define DO4(buf) DO2(buf); DO2(buf);
|
||||
#define DO8(buf) DO4(buf); DO4(buf);
|
||||
|
||||
/* ========================================================================= */
|
||||
uLong ZEXPORT crc32(crc, buf, len)
|
||||
uLong crc;
|
||||
const Bytef *buf;
|
||||
uInt len;
|
||||
{
|
||||
#ifdef DYNAMIC_CRC_TABLE
|
||||
if (crc_table_empty)
|
||||
make_crc_table();
|
||||
#endif
|
||||
crc = crc ^ 0xffffffffL;
|
||||
while (len >= 8)
|
||||
{
|
||||
DO8(buf);
|
||||
len -= 8;
|
||||
}
|
||||
if (len) do {
|
||||
DO1(buf);
|
||||
} while (--len);
|
||||
return crc ^ 0xffffffffL;
|
||||
}
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
|
||||
|
||||
/* No ones complement version. JFFS2 (and other things ?)
|
||||
* don't use ones compliment in their CRC calculations.
|
||||
*/
|
||||
uLong ZEXPORT crc32_no_comp(uLong crc, const Bytef *buf, uInt len)
|
||||
{
|
||||
#ifdef DYNAMIC_CRC_TABLE
|
||||
if (crc_table_empty)
|
||||
make_crc_table();
|
||||
#endif
|
||||
while (len >= 8)
|
||||
{
|
||||
DO8(buf);
|
||||
len -= 8;
|
||||
}
|
||||
if (len) do {
|
||||
DO1(buf);
|
||||
} while (--len);
|
||||
|
||||
return crc;
|
||||
}
|
||||
|
||||
#endif /* CFG_CMD_JFFS2 */
|
157
toolchain/mkimage/src/image.h
Normal file
157
toolchain/mkimage/src/image.h
Normal file
@ -0,0 +1,157 @@
|
||||
/*
|
||||
* (C) Copyright 2000-2005
|
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
* project.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*
|
||||
********************************************************************
|
||||
* NOTE: This header file defines an interface to U-Boot. Including
|
||||
* this (unmodified) header file in another file is considered normal
|
||||
* use of U-Boot, and does *not* fall under the heading of "derived
|
||||
* work".
|
||||
********************************************************************
|
||||
*/
|
||||
|
||||
#ifndef __IMAGE_H__
|
||||
#define __IMAGE_H__
|
||||
|
||||
/*
|
||||
* Operating System Codes
|
||||
*/
|
||||
#define IH_OS_INVALID 0 /* Invalid OS */
|
||||
#define IH_OS_OPENBSD 1 /* OpenBSD */
|
||||
#define IH_OS_NETBSD 2 /* NetBSD */
|
||||
#define IH_OS_FREEBSD 3 /* FreeBSD */
|
||||
#define IH_OS_4_4BSD 4 /* 4.4BSD */
|
||||
#define IH_OS_LINUX 5 /* Linux */
|
||||
#define IH_OS_SVR4 6 /* SVR4 */
|
||||
#define IH_OS_ESIX 7 /* Esix */
|
||||
#define IH_OS_SOLARIS 8 /* Solaris */
|
||||
#define IH_OS_IRIX 9 /* Irix */
|
||||
#define IH_OS_SCO 10 /* SCO */
|
||||
#define IH_OS_DELL 11 /* Dell */
|
||||
#define IH_OS_NCR 12 /* NCR */
|
||||
#define IH_OS_LYNXOS 13 /* LynxOS */
|
||||
#define IH_OS_VXWORKS 14 /* VxWorks */
|
||||
#define IH_OS_PSOS 15 /* pSOS */
|
||||
#define IH_OS_QNX 16 /* QNX */
|
||||
#define IH_OS_U_BOOT 17 /* Firmware */
|
||||
#define IH_OS_RTEMS 18 /* RTEMS */
|
||||
#define IH_OS_ARTOS 19 /* ARTOS */
|
||||
#define IH_OS_UNITY 20 /* Unity OS */
|
||||
|
||||
/*
|
||||
* CPU Architecture Codes (supported by Linux)
|
||||
*/
|
||||
#define IH_CPU_INVALID 0 /* Invalid CPU */
|
||||
#define IH_CPU_ALPHA 1 /* Alpha */
|
||||
#define IH_CPU_ARM 2 /* ARM */
|
||||
#define IH_CPU_I386 3 /* Intel x86 */
|
||||
#define IH_CPU_IA64 4 /* IA64 */
|
||||
#define IH_CPU_MIPS 5 /* MIPS */
|
||||
#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
|
||||
#define IH_CPU_PPC 7 /* PowerPC */
|
||||
#define IH_CPU_S390 8 /* IBM S390 */
|
||||
#define IH_CPU_SH 9 /* SuperH */
|
||||
#define IH_CPU_SPARC 10 /* Sparc */
|
||||
#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
|
||||
#define IH_CPU_M68K 12 /* M68K */
|
||||
#define IH_CPU_NIOS 13 /* Nios-32 */
|
||||
#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
|
||||
#define IH_CPU_NIOS2 15 /* Nios-II */
|
||||
|
||||
/*
|
||||
* Image Types
|
||||
*
|
||||
* "Standalone Programs" are directly runnable in the environment
|
||||
* provided by U-Boot; it is expected that (if they behave
|
||||
* well) you can continue to work in U-Boot after return from
|
||||
* the Standalone Program.
|
||||
* "OS Kernel Images" are usually images of some Embedded OS which
|
||||
* will take over control completely. Usually these programs
|
||||
* will install their own set of exception handlers, device
|
||||
* drivers, set up the MMU, etc. - this means, that you cannot
|
||||
* expect to re-enter U-Boot except by resetting the CPU.
|
||||
* "RAMDisk Images" are more or less just data blocks, and their
|
||||
* parameters (address, size) are passed to an OS kernel that is
|
||||
* being started.
|
||||
* "Multi-File Images" contain several images, typically an OS
|
||||
* (Linux) kernel image and one or more data images like
|
||||
* RAMDisks. This construct is useful for instance when you want
|
||||
* to boot over the network using BOOTP etc., where the boot
|
||||
* server provides just a single image file, but you want to get
|
||||
* for instance an OS kernel and a RAMDisk image.
|
||||
*
|
||||
* "Multi-File Images" start with a list of image sizes, each
|
||||
* image size (in bytes) specified by an "uint32_t" in network
|
||||
* byte order. This list is terminated by an "(uint32_t)0".
|
||||
* Immediately after the terminating 0 follow the images, one by
|
||||
* one, all aligned on "uint32_t" boundaries (size rounded up to
|
||||
* a multiple of 4 bytes - except for the last file).
|
||||
*
|
||||
* "Firmware Images" are binary images containing firmware (like
|
||||
* U-Boot or FPGA images) which usually will be programmed to
|
||||
* flash memory.
|
||||
*
|
||||
* "Script files" are command sequences that will be executed by
|
||||
* U-Boot's command interpreter; this feature is especially
|
||||
* useful when you configure U-Boot to use a real shell (hush)
|
||||
* as command interpreter (=> Shell Scripts).
|
||||
*/
|
||||
|
||||
#define IH_TYPE_INVALID 0 /* Invalid Image */
|
||||
#define IH_TYPE_STANDALONE 1 /* Standalone Program */
|
||||
#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
|
||||
#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
|
||||
#define IH_TYPE_MULTI 4 /* Multi-File Image */
|
||||
#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
|
||||
#define IH_TYPE_SCRIPT 6 /* Script file */
|
||||
#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
|
||||
|
||||
/*
|
||||
* Compression Types
|
||||
*/
|
||||
#define IH_COMP_NONE 0 /* No Compression Used */
|
||||
#define IH_COMP_GZIP 1 /* gzip Compression Used */
|
||||
#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
|
||||
|
||||
#define IH_MAGIC 0x27051956 /* Image Magic Number */
|
||||
#define IH_NMLEN 32 /* Image Name Length */
|
||||
|
||||
/*
|
||||
* all data in network byte order (aka natural aka bigendian)
|
||||
*/
|
||||
|
||||
typedef struct image_header {
|
||||
uint32_t ih_magic; /* Image Header Magic Number */
|
||||
uint32_t ih_hcrc; /* Image Header CRC Checksum */
|
||||
uint32_t ih_time; /* Image Creation Timestamp */
|
||||
uint32_t ih_size; /* Image Data Size */
|
||||
uint32_t ih_load; /* Data Load Address */
|
||||
uint32_t ih_ep; /* Entry Point Address */
|
||||
uint32_t ih_dcrc; /* Image Data CRC Checksum */
|
||||
uint8_t ih_os; /* Operating System */
|
||||
uint8_t ih_arch; /* CPU architecture */
|
||||
uint8_t ih_type; /* Image Type */
|
||||
uint8_t ih_comp; /* Compression Type */
|
||||
uint8_t ih_name[IH_NMLEN]; /* Image Name */
|
||||
} image_header_t;
|
||||
|
||||
|
||||
#endif /* __IMAGE_H__ */
|
745
toolchain/mkimage/src/mkimage.c
Normal file
745
toolchain/mkimage/src/mkimage.c
Normal file
@ -0,0 +1,745 @@
|
||||
/*
|
||||
* (C) Copyright 2000-2004
|
||||
* DENX Software Engineering
|
||||
* Wolfgang Denk, wd@denx.de
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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 <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifndef __WIN32__
|
||||
#include <netinet/in.h> /* for host / network byte order conversions */
|
||||
#endif
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
|
||||
#ifdef __WIN32__
|
||||
typedef unsigned int __u32;
|
||||
|
||||
#define SWAP_LONG(x) \
|
||||
((__u32)( \
|
||||
(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
|
||||
(((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
|
||||
(((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
|
||||
(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
|
||||
typedef unsigned char uint8_t;
|
||||
typedef unsigned short uint16_t;
|
||||
typedef unsigned int uint32_t;
|
||||
|
||||
#define ntohl(a) SWAP_LONG(a)
|
||||
#define htonl(a) SWAP_LONG(a)
|
||||
#endif /* __WIN32__ */
|
||||
|
||||
#ifndef O_BINARY /* should be define'd on __WIN32__ */
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
#include "image.h"
|
||||
|
||||
extern int errno;
|
||||
|
||||
#ifndef MAP_FAILED
|
||||
#define MAP_FAILED (-1)
|
||||
#endif
|
||||
|
||||
char *cmdname;
|
||||
|
||||
extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
|
||||
|
||||
typedef struct table_entry {
|
||||
int val; /* as defined in image.h */
|
||||
char *sname; /* short (input) name */
|
||||
char *lname; /* long (output) name */
|
||||
} table_entry_t;
|
||||
|
||||
table_entry_t arch_name[] = {
|
||||
{ IH_CPU_INVALID, NULL, "Invalid CPU", },
|
||||
{ IH_CPU_ALPHA, "alpha", "Alpha", },
|
||||
{ IH_CPU_ARM, "arm", "ARM", },
|
||||
{ IH_CPU_I386, "x86", "Intel x86", },
|
||||
{ IH_CPU_IA64, "ia64", "IA64", },
|
||||
{ IH_CPU_M68K, "m68k", "MC68000", },
|
||||
{ IH_CPU_MICROBLAZE, "microblaze", "MicroBlaze", },
|
||||
{ IH_CPU_MIPS, "mips", "MIPS", },
|
||||
{ IH_CPU_MIPS64, "mips64", "MIPS 64 Bit", },
|
||||
{ IH_CPU_NIOS, "nios", "NIOS", },
|
||||
{ IH_CPU_NIOS2, "nios2", "NIOS II", },
|
||||
{ IH_CPU_PPC, "ppc", "PowerPC", },
|
||||
{ IH_CPU_S390, "s390", "IBM S390", },
|
||||
{ IH_CPU_SH, "sh", "SuperH", },
|
||||
{ IH_CPU_SPARC, "sparc", "SPARC", },
|
||||
{ IH_CPU_SPARC64, "sparc64", "SPARC 64 Bit", },
|
||||
{ -1, "", "", },
|
||||
};
|
||||
|
||||
table_entry_t os_name[] = {
|
||||
{ IH_OS_INVALID, NULL, "Invalid OS", },
|
||||
{ IH_OS_4_4BSD, "4_4bsd", "4_4BSD", },
|
||||
{ IH_OS_ARTOS, "artos", "ARTOS", },
|
||||
{ IH_OS_DELL, "dell", "Dell", },
|
||||
{ IH_OS_ESIX, "esix", "Esix", },
|
||||
{ IH_OS_FREEBSD, "freebsd", "FreeBSD", },
|
||||
{ IH_OS_IRIX, "irix", "Irix", },
|
||||
{ IH_OS_LINUX, "linux", "Linux", },
|
||||
{ IH_OS_LYNXOS, "lynxos", "LynxOS", },
|
||||
{ IH_OS_NCR, "ncr", "NCR", },
|
||||
{ IH_OS_NETBSD, "netbsd", "NetBSD", },
|
||||
{ IH_OS_OPENBSD, "openbsd", "OpenBSD", },
|
||||
{ IH_OS_PSOS, "psos", "pSOS", },
|
||||
{ IH_OS_QNX, "qnx", "QNX", },
|
||||
{ IH_OS_RTEMS, "rtems", "RTEMS", },
|
||||
{ IH_OS_SCO, "sco", "SCO", },
|
||||
{ IH_OS_SOLARIS, "solaris", "Solaris", },
|
||||
{ IH_OS_SVR4, "svr4", "SVR4", },
|
||||
{ IH_OS_U_BOOT, "u-boot", "U-Boot", },
|
||||
{ IH_OS_VXWORKS, "vxworks", "VxWorks", },
|
||||
{ -1, "", "", },
|
||||
};
|
||||
|
||||
table_entry_t type_name[] = {
|
||||
{ IH_TYPE_INVALID, NULL, "Invalid Image", },
|
||||
{ IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", },
|
||||
{ IH_TYPE_FIRMWARE, "firmware", "Firmware", },
|
||||
{ IH_TYPE_KERNEL, "kernel", "Kernel Image", },
|
||||
{ IH_TYPE_MULTI, "multi", "Multi-File Image", },
|
||||
{ IH_TYPE_RAMDISK, "ramdisk", "RAMDisk Image", },
|
||||
{ IH_TYPE_SCRIPT, "script", "Script", },
|
||||
{ IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
|
||||
{ -1, "", "", },
|
||||
};
|
||||
|
||||
table_entry_t comp_name[] = {
|
||||
{ IH_COMP_NONE, "none", "uncompressed", },
|
||||
{ IH_COMP_BZIP2, "bzip2", "bzip2 compressed", },
|
||||
{ IH_COMP_GZIP, "gzip", "gzip compressed", },
|
||||
{ -1, "", "", },
|
||||
};
|
||||
|
||||
static void copy_file (int, const char *, int);
|
||||
static void usage (void);
|
||||
static void print_header (image_header_t *);
|
||||
static void print_type (image_header_t *);
|
||||
static char *put_table_entry (table_entry_t *, char *, int);
|
||||
static char *put_arch (int);
|
||||
static char *put_type (int);
|
||||
static char *put_os (int);
|
||||
static char *put_comp (int);
|
||||
static int get_table_entry (table_entry_t *, char *, char *);
|
||||
static int get_arch(char *);
|
||||
static int get_comp(char *);
|
||||
static int get_os (char *);
|
||||
static int get_type(char *);
|
||||
|
||||
|
||||
char *datafile;
|
||||
char *imagefile;
|
||||
|
||||
int dflag = 0;
|
||||
int eflag = 0;
|
||||
int lflag = 0;
|
||||
int vflag = 0;
|
||||
int xflag = 0;
|
||||
int opt_os = IH_OS_LINUX;
|
||||
int opt_arch = IH_CPU_PPC;
|
||||
int opt_type = IH_TYPE_KERNEL;
|
||||
int opt_comp = IH_COMP_GZIP;
|
||||
|
||||
image_header_t header;
|
||||
image_header_t *hdr = &header;
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
int ifd;
|
||||
uint32_t checksum;
|
||||
uint32_t addr;
|
||||
uint32_t ep;
|
||||
struct stat sbuf;
|
||||
unsigned char *ptr;
|
||||
char *name = "";
|
||||
|
||||
cmdname = *argv;
|
||||
|
||||
addr = ep = 0;
|
||||
|
||||
while (--argc > 0 && **++argv == '-') {
|
||||
while (*++*argv) {
|
||||
switch (**argv) {
|
||||
case 'l':
|
||||
lflag = 1;
|
||||
break;
|
||||
case 'A':
|
||||
if ((--argc <= 0) ||
|
||||
(opt_arch = get_arch(*++argv)) < 0)
|
||||
usage ();
|
||||
goto NXTARG;
|
||||
case 'C':
|
||||
if ((--argc <= 0) ||
|
||||
(opt_comp = get_comp(*++argv)) < 0)
|
||||
usage ();
|
||||
goto NXTARG;
|
||||
case 'O':
|
||||
if ((--argc <= 0) ||
|
||||
(opt_os = get_os(*++argv)) < 0)
|
||||
usage ();
|
||||
goto NXTARG;
|
||||
case 'T':
|
||||
if ((--argc <= 0) ||
|
||||
(opt_type = get_type(*++argv)) < 0)
|
||||
usage ();
|
||||
goto NXTARG;
|
||||
|
||||
case 'a':
|
||||
if (--argc <= 0)
|
||||
usage ();
|
||||
addr = strtoul (*++argv, (char **)&ptr, 16);
|
||||
if (*ptr) {
|
||||
fprintf (stderr,
|
||||
"%s: invalid load address %s\n",
|
||||
cmdname, *argv);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
goto NXTARG;
|
||||
case 'd':
|
||||
if (--argc <= 0)
|
||||
usage ();
|
||||
datafile = *++argv;
|
||||
dflag = 1;
|
||||
goto NXTARG;
|
||||
case 'e':
|
||||
if (--argc <= 0)
|
||||
usage ();
|
||||
ep = strtoul (*++argv, (char **)&ptr, 16);
|
||||
if (*ptr) {
|
||||
fprintf (stderr,
|
||||
"%s: invalid entry point %s\n",
|
||||
cmdname, *argv);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
eflag = 1;
|
||||
goto NXTARG;
|
||||
case 'n':
|
||||
if (--argc <= 0)
|
||||
usage ();
|
||||
name = *++argv;
|
||||
goto NXTARG;
|
||||
case 'v':
|
||||
vflag++;
|
||||
break;
|
||||
case 'x':
|
||||
xflag++;
|
||||
break;
|
||||
default:
|
||||
usage ();
|
||||
}
|
||||
}
|
||||
NXTARG: ;
|
||||
}
|
||||
|
||||
if ((argc != 1) || ((lflag ^ dflag) == 0))
|
||||
usage();
|
||||
|
||||
if (!eflag) {
|
||||
ep = addr;
|
||||
/* If XIP, entry point must be after the U-Boot header */
|
||||
if (xflag)
|
||||
ep += sizeof(image_header_t);
|
||||
}
|
||||
|
||||
/*
|
||||
* If XIP, ensure the entry point is equal to the load address plus
|
||||
* the size of the U-Boot header.
|
||||
*/
|
||||
if (xflag) {
|
||||
if (ep != addr + sizeof(image_header_t)) {
|
||||
fprintf (stderr, "%s: For XIP, the entry point must be the load addr + %lu\n",
|
||||
cmdname,
|
||||
(unsigned long)sizeof(image_header_t));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
imagefile = *argv;
|
||||
|
||||
if (lflag) {
|
||||
ifd = open(imagefile, O_RDONLY|O_BINARY);
|
||||
} else {
|
||||
ifd = open(imagefile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0666);
|
||||
}
|
||||
|
||||
if (ifd < 0) {
|
||||
fprintf (stderr, "%s: Can't open %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (lflag) {
|
||||
int len;
|
||||
char *data;
|
||||
/*
|
||||
* list header information of existing image
|
||||
*/
|
||||
if (fstat(ifd, &sbuf) < 0) {
|
||||
fprintf (stderr, "%s: Can't stat %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if ((unsigned)sbuf.st_size < sizeof(image_header_t)) {
|
||||
fprintf (stderr,
|
||||
"%s: Bad size: \"%s\" is no valid image\n",
|
||||
cmdname, imagefile);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
ptr = (unsigned char *)mmap(0, sbuf.st_size,
|
||||
PROT_READ, MAP_SHARED, ifd, 0);
|
||||
if ((caddr_t)ptr == (caddr_t)-1) {
|
||||
fprintf (stderr, "%s: Can't read %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/*
|
||||
* create copy of header so that we can blank out the
|
||||
* checksum field for checking - this can't be done
|
||||
* on the PROT_READ mapped data.
|
||||
*/
|
||||
memcpy (hdr, ptr, sizeof(image_header_t));
|
||||
|
||||
if (ntohl(hdr->ih_magic) != IH_MAGIC) {
|
||||
fprintf (stderr,
|
||||
"%s: Bad Magic Number: \"%s\" is no valid image\n",
|
||||
cmdname, imagefile);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
data = (char *)hdr;
|
||||
len = sizeof(image_header_t);
|
||||
|
||||
checksum = ntohl(hdr->ih_hcrc);
|
||||
hdr->ih_hcrc = htonl(0); /* clear for re-calculation */
|
||||
|
||||
if (crc32 (0, data, len) != checksum) {
|
||||
fprintf (stderr,
|
||||
"*** Warning: \"%s\" has bad header checksum!\n",
|
||||
imagefile);
|
||||
}
|
||||
|
||||
data = (char *)(ptr + sizeof(image_header_t));
|
||||
len = sbuf.st_size - sizeof(image_header_t) ;
|
||||
|
||||
if (crc32 (0, data, len) != ntohl(hdr->ih_dcrc)) {
|
||||
fprintf (stderr,
|
||||
"*** Warning: \"%s\" has corrupted data!\n",
|
||||
imagefile);
|
||||
}
|
||||
|
||||
/* for multi-file images we need the data part, too */
|
||||
print_header ((image_header_t *)ptr);
|
||||
|
||||
(void) munmap((void *)ptr, sbuf.st_size);
|
||||
(void) close (ifd);
|
||||
|
||||
exit (EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
/*
|
||||
* Must be -w then:
|
||||
*
|
||||
* write dummy header, to be fixed later
|
||||
*/
|
||||
memset (hdr, 0, sizeof(image_header_t));
|
||||
|
||||
if (write(ifd, hdr, sizeof(image_header_t)) != sizeof(image_header_t)) {
|
||||
fprintf (stderr, "%s: Write error on %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (opt_type == IH_TYPE_MULTI || opt_type == IH_TYPE_SCRIPT) {
|
||||
char *file = datafile;
|
||||
unsigned long size;
|
||||
|
||||
for (;;) {
|
||||
char *sep = NULL;
|
||||
|
||||
if (file) {
|
||||
if ((sep = strchr(file, ':')) != NULL) {
|
||||
*sep = '\0';
|
||||
}
|
||||
|
||||
if (stat (file, &sbuf) < 0) {
|
||||
fprintf (stderr, "%s: Can't stat %s: %s\n",
|
||||
cmdname, file, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
size = htonl(sbuf.st_size);
|
||||
} else {
|
||||
size = 0;
|
||||
}
|
||||
|
||||
if (write(ifd, (char *)&size, sizeof(size)) != sizeof(size)) {
|
||||
fprintf (stderr, "%s: Write error on %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (!file) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (sep) {
|
||||
*sep = ':';
|
||||
file = sep + 1;
|
||||
} else {
|
||||
file = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
file = datafile;
|
||||
|
||||
for (;;) {
|
||||
char *sep = strchr(file, ':');
|
||||
if (sep) {
|
||||
*sep = '\0';
|
||||
copy_file (ifd, file, 1);
|
||||
*sep++ = ':';
|
||||
file = sep;
|
||||
} else {
|
||||
copy_file (ifd, file, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
copy_file (ifd, datafile, 0);
|
||||
}
|
||||
|
||||
/* We're a bit of paranoid */
|
||||
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
|
||||
(void) fdatasync (ifd);
|
||||
#else
|
||||
(void) fsync (ifd);
|
||||
#endif
|
||||
|
||||
if (fstat(ifd, &sbuf) < 0) {
|
||||
fprintf (stderr, "%s: Can't stat %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
ptr = (unsigned char *)mmap(0, sbuf.st_size,
|
||||
PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0);
|
||||
if (ptr == (unsigned char *)MAP_FAILED) {
|
||||
fprintf (stderr, "%s: Can't map %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
hdr = (image_header_t *)ptr;
|
||||
|
||||
checksum = crc32 (0,
|
||||
(const char *)(ptr + sizeof(image_header_t)),
|
||||
sbuf.st_size - sizeof(image_header_t)
|
||||
);
|
||||
|
||||
/* Build new header */
|
||||
hdr->ih_magic = htonl(IH_MAGIC);
|
||||
hdr->ih_time = htonl(sbuf.st_mtime);
|
||||
hdr->ih_size = htonl(sbuf.st_size - sizeof(image_header_t));
|
||||
hdr->ih_load = htonl(addr);
|
||||
hdr->ih_ep = htonl(ep);
|
||||
hdr->ih_dcrc = htonl(checksum);
|
||||
hdr->ih_os = opt_os;
|
||||
hdr->ih_arch = opt_arch;
|
||||
hdr->ih_type = opt_type;
|
||||
hdr->ih_comp = opt_comp;
|
||||
|
||||
strncpy((char *)hdr->ih_name, name, IH_NMLEN);
|
||||
|
||||
checksum = crc32(0,(const char *)hdr,sizeof(image_header_t));
|
||||
|
||||
hdr->ih_hcrc = htonl(checksum);
|
||||
|
||||
print_header (hdr);
|
||||
|
||||
(void) munmap((void *)ptr, sbuf.st_size);
|
||||
|
||||
/* We're a bit of paranoid */
|
||||
#if defined(_POSIX_SYNCHRONIZED_IO) && !defined(__sun__) && !defined(__FreeBSD__)
|
||||
(void) fdatasync (ifd);
|
||||
#else
|
||||
(void) fsync (ifd);
|
||||
#endif
|
||||
|
||||
if (close(ifd)) {
|
||||
fprintf (stderr, "%s: Write error on %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
exit (EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
static void
|
||||
copy_file (int ifd, const char *datafile, int pad)
|
||||
{
|
||||
int dfd;
|
||||
struct stat sbuf;
|
||||
unsigned char *ptr;
|
||||
int tail;
|
||||
int zero = 0;
|
||||
int offset = 0;
|
||||
int size;
|
||||
|
||||
if (vflag) {
|
||||
fprintf (stderr, "Adding Image %s\n", datafile);
|
||||
}
|
||||
|
||||
if ((dfd = open(datafile, O_RDONLY|O_BINARY)) < 0) {
|
||||
fprintf (stderr, "%s: Can't open %s: %s\n",
|
||||
cmdname, datafile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (fstat(dfd, &sbuf) < 0) {
|
||||
fprintf (stderr, "%s: Can't stat %s: %s\n",
|
||||
cmdname, datafile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
ptr = (unsigned char *)mmap(0, sbuf.st_size,
|
||||
PROT_READ, MAP_SHARED, dfd, 0);
|
||||
if (ptr == (unsigned char *)MAP_FAILED) {
|
||||
fprintf (stderr, "%s: Can't read %s: %s\n",
|
||||
cmdname, datafile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (xflag) {
|
||||
unsigned char *p = NULL;
|
||||
/*
|
||||
* XIP: do not append the image_header_t at the
|
||||
* beginning of the file, but consume the space
|
||||
* reserved for it.
|
||||
*/
|
||||
|
||||
if ((unsigned)sbuf.st_size < sizeof(image_header_t)) {
|
||||
fprintf (stderr,
|
||||
"%s: Bad size: \"%s\" is too small for XIP\n",
|
||||
cmdname, datafile);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
for (p=ptr; p < ptr+sizeof(image_header_t); p++) {
|
||||
if ( *p != 0xff ) {
|
||||
fprintf (stderr,
|
||||
"%s: Bad file: \"%s\" has invalid buffer for XIP\n",
|
||||
cmdname, datafile);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
offset = sizeof(image_header_t);
|
||||
}
|
||||
|
||||
size = sbuf.st_size - offset;
|
||||
if (write(ifd, ptr + offset, size) != size) {
|
||||
fprintf (stderr, "%s: Write error on %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (pad && ((tail = size % 4) != 0)) {
|
||||
|
||||
if (write(ifd, (char *)&zero, 4-tail) != 4-tail) {
|
||||
fprintf (stderr, "%s: Write error on %s: %s\n",
|
||||
cmdname, imagefile, strerror(errno));
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
(void) munmap((void *)ptr, sbuf.st_size);
|
||||
(void) close (dfd);
|
||||
}
|
||||
|
||||
void
|
||||
usage ()
|
||||
{
|
||||
fprintf (stderr, "Usage: %s -l image\n"
|
||||
" -l ==> list image header information\n"
|
||||
" %s [-x] -A arch -O os -T type -C comp "
|
||||
"-a addr -e ep -n name -d data_file[:data_file...] image\n",
|
||||
cmdname, cmdname);
|
||||
fprintf (stderr, " -A ==> set architecture to 'arch'\n"
|
||||
" -O ==> set operating system to 'os'\n"
|
||||
" -T ==> set image type to 'type'\n"
|
||||
" -C ==> set compression type 'comp'\n"
|
||||
" -a ==> set load address to 'addr' (hex)\n"
|
||||
" -e ==> set entry point to 'ep' (hex)\n"
|
||||
" -n ==> set image name to 'name'\n"
|
||||
" -d ==> use image data from 'datafile'\n"
|
||||
" -x ==> set XIP (execute in place)\n"
|
||||
);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static void
|
||||
print_header (image_header_t *hdr)
|
||||
{
|
||||
time_t timestamp;
|
||||
uint32_t size;
|
||||
|
||||
timestamp = (time_t)ntohl(hdr->ih_time);
|
||||
size = ntohl(hdr->ih_size);
|
||||
|
||||
printf ("Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
|
||||
printf ("Created: %s", ctime(×tamp));
|
||||
printf ("Image Type: "); print_type(hdr);
|
||||
printf ("Data Size: %d Bytes = %.2f kB = %.2f MB\n",
|
||||
size, (double)size / 1.024e3, (double)size / 1.048576e6 );
|
||||
printf ("Load Address: 0x%08X\n", ntohl(hdr->ih_load));
|
||||
printf ("Entry Point: 0x%08X\n", ntohl(hdr->ih_ep));
|
||||
|
||||
if (hdr->ih_type == IH_TYPE_MULTI || hdr->ih_type == IH_TYPE_SCRIPT) {
|
||||
int i, ptrs;
|
||||
uint32_t pos;
|
||||
unsigned long *len_ptr = (unsigned long *) (
|
||||
(unsigned long)hdr + sizeof(image_header_t)
|
||||
);
|
||||
|
||||
/* determine number of images first (to calculate image offsets) */
|
||||
for (i=0; len_ptr[i]; ++i) /* null pointer terminates list */
|
||||
;
|
||||
ptrs = i; /* null pointer terminates list */
|
||||
|
||||
pos = sizeof(image_header_t) + ptrs * sizeof(long);
|
||||
printf ("Contents:\n");
|
||||
for (i=0; len_ptr[i]; ++i) {
|
||||
size = ntohl(len_ptr[i]);
|
||||
|
||||
printf (" Image %d: %8d Bytes = %4d kB = %d MB\n",
|
||||
i, size, size>>10, size>>20);
|
||||
if (hdr->ih_type == IH_TYPE_SCRIPT && i > 0) {
|
||||
/*
|
||||
* the user may need to know offsets
|
||||
* if planning to do something with
|
||||
* multiple files
|
||||
*/
|
||||
printf (" Offset = %08X\n", pos);
|
||||
}
|
||||
/* copy_file() will pad the first files to even word align */
|
||||
size += 3;
|
||||
size &= ~3;
|
||||
pos += size;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
print_type (image_header_t *hdr)
|
||||
{
|
||||
printf ("%s %s %s (%s)\n",
|
||||
put_arch (hdr->ih_arch),
|
||||
put_os (hdr->ih_os ),
|
||||
put_type (hdr->ih_type),
|
||||
put_comp (hdr->ih_comp)
|
||||
);
|
||||
}
|
||||
|
||||
static char *put_arch (int arch)
|
||||
{
|
||||
return (put_table_entry(arch_name, "Unknown Architecture", arch));
|
||||
}
|
||||
|
||||
static char *put_os (int os)
|
||||
{
|
||||
return (put_table_entry(os_name, "Unknown OS", os));
|
||||
}
|
||||
|
||||
static char *put_type (int type)
|
||||
{
|
||||
return (put_table_entry(type_name, "Unknown Image", type));
|
||||
}
|
||||
|
||||
static char *put_comp (int comp)
|
||||
{
|
||||
return (put_table_entry(comp_name, "Unknown Compression", comp));
|
||||
}
|
||||
|
||||
static char *put_table_entry (table_entry_t *table, char *msg, int type)
|
||||
{
|
||||
for (; table->val>=0; ++table) {
|
||||
if (table->val == type)
|
||||
return (table->lname);
|
||||
}
|
||||
return (msg);
|
||||
}
|
||||
|
||||
static int get_arch(char *name)
|
||||
{
|
||||
return (get_table_entry(arch_name, "CPU", name));
|
||||
}
|
||||
|
||||
|
||||
static int get_comp(char *name)
|
||||
{
|
||||
return (get_table_entry(comp_name, "Compression", name));
|
||||
}
|
||||
|
||||
|
||||
static int get_os (char *name)
|
||||
{
|
||||
return (get_table_entry(os_name, "OS", name));
|
||||
}
|
||||
|
||||
|
||||
static int get_type(char *name)
|
||||
{
|
||||
return (get_table_entry(type_name, "Image", name));
|
||||
}
|
||||
|
||||
static int get_table_entry (table_entry_t *table, char *msg, char *name)
|
||||
{
|
||||
table_entry_t *t;
|
||||
int first = 1;
|
||||
|
||||
for (t=table; t->val>=0; ++t) {
|
||||
if (t->sname && strcasecmp(t->sname, name)==0)
|
||||
return (t->val);
|
||||
}
|
||||
fprintf (stderr, "\nInvalid %s Type - valid names are", msg);
|
||||
for (t=table; t->val>=0; ++t) {
|
||||
if (t->sname == NULL)
|
||||
continue;
|
||||
fprintf (stderr, "%c %s", (first) ? ':' : ',', t->sname);
|
||||
first = 0;
|
||||
}
|
||||
fprintf (stderr, "\n");
|
||||
return (-1);
|
||||
}
|
223
toolchain/uClibc/patches/130-ppc_gcc4_fix.patch
Normal file
223
toolchain/uClibc/patches/130-ppc_gcc4_fix.patch
Normal file
@ -0,0 +1,223 @@
|
||||
diff -Nur uClibc-0.9.28/libc/sysdeps/linux/powerpc/bits/syscalls.h uClibc-0.9.28-owrt/libc/sysdeps/linux/powerpc/bits/syscalls.h
|
||||
--- uClibc-0.9.28/libc/sysdeps/linux/powerpc/bits/syscalls.h 2005-08-18 00:49:41.000000000 +0200
|
||||
+++ uClibc-0.9.28-owrt/libc/sysdeps/linux/powerpc/bits/syscalls.h 2006-08-25 17:58:21.000000000 +0200
|
||||
@@ -5,67 +5,164 @@
|
||||
# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
|
||||
#endif
|
||||
|
||||
+#include <errno.h>
|
||||
+
|
||||
/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
|
||||
* header files. It also defines the traditional `SYS_<name>' macros for older
|
||||
* programs. */
|
||||
#include <bits/sysnum.h>
|
||||
|
||||
-
|
||||
-#define __STRINGIFY(s) __STRINGIFY2 (s)
|
||||
-#define __STRINGIFY2(s) #s
|
||||
-
|
||||
-#undef JUMPTARGET
|
||||
-#ifdef __PIC__
|
||||
-#define __MAKE_SYSCALL __STRINGIFY(__uClibc_syscall@plt)
|
||||
+/* Define a macro which expands inline into the wrapper code for a system
|
||||
+ call. This use is for internal calls that do not need to handle errors
|
||||
+ normally. It will never touch errno.
|
||||
+ On powerpc a system call basically clobbers the same registers like a
|
||||
+ function call, with the exception of LR (which is needed for the
|
||||
+ "sc; bnslr+" sequence) and CR (where only CR0.SO is clobbered to signal
|
||||
+ an error return status). */
|
||||
+
|
||||
+# undef INLINE_SYSCALL
|
||||
+#if 1
|
||||
+# define INLINE_SYSCALL(name, nr, args...) \
|
||||
+ ({ \
|
||||
+ INTERNAL_SYSCALL_DECL (sc_err); \
|
||||
+ long int sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, args); \
|
||||
+ if (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
||||
+ { \
|
||||
+ __set_errno (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err)); \
|
||||
+ sc_ret = -1L; \
|
||||
+ } \
|
||||
+ sc_ret; \
|
||||
+ })
|
||||
#else
|
||||
-#define __MAKE_SYSCALL __STRINGIFY(__uClibc_syscall)
|
||||
+# define INLINE_SYSCALL(name, nr, args...) \
|
||||
+ ({ \
|
||||
+ INTERNAL_SYSCALL_DECL (sc_err); \
|
||||
+ long int sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, args); \
|
||||
+ if (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
||||
+ { \
|
||||
+ sc_ret = __syscall_error(INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err));\
|
||||
+ } \
|
||||
+ sc_ret; \
|
||||
+ })
|
||||
#endif
|
||||
|
||||
-#define unified_syscall_body(name) \
|
||||
- __asm__ ( \
|
||||
- ".section \".text\"\n\t" \
|
||||
- ".align 2\n\t" \
|
||||
- ".globl " __STRINGIFY(name) "\n\t" \
|
||||
- ".type " __STRINGIFY(name) ",@function\n\t" \
|
||||
- #name":\tli 0," __STRINGIFY(__NR_##name) "\n\t" \
|
||||
- "b " __MAKE_SYSCALL "\n\t" \
|
||||
- ".size\t" __STRINGIFY(name) ",.""-" __STRINGIFY(name) "\n" \
|
||||
- )
|
||||
+/* Define a macro which expands inline into the wrapper code for a system
|
||||
+ call. This use is for internal calls that do not need to handle errors
|
||||
+ normally. It will never touch errno.
|
||||
+ On powerpc a system call basically clobbers the same registers like a
|
||||
+ function call, with the exception of LR (which is needed for the
|
||||
+ "sc; bnslr+" sequence) and CR (where only CR0.SO is clobbered to signal
|
||||
+ an error return status). */
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_DECL
|
||||
+# define INTERNAL_SYSCALL_DECL(err) long int err
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL
|
||||
+# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
|
||||
+ ({ \
|
||||
+ register long int r0 __asm__ ("r0"); \
|
||||
+ register long int r3 __asm__ ("r3"); \
|
||||
+ register long int r4 __asm__ ("r4"); \
|
||||
+ register long int r5 __asm__ ("r5"); \
|
||||
+ register long int r6 __asm__ ("r6"); \
|
||||
+ register long int r7 __asm__ ("r7"); \
|
||||
+ register long int r8 __asm__ ("r8"); \
|
||||
+ register long int r9 __asm__ ("r9"); \
|
||||
+ register long int r10 __asm__ ("r10"); \
|
||||
+ register long int r11 __asm__ ("r11"); \
|
||||
+ register long int r12 __asm__ ("r12"); \
|
||||
+ LOADARGS_##nr(name, args); \
|
||||
+ __asm__ __volatile__ \
|
||||
+ ("sc \n\t" \
|
||||
+ "mfcr %0" \
|
||||
+ : "=&r" (r0), \
|
||||
+ "=&r" (r3), "=&r" (r4), "=&r" (r5), "=&r" (r6), "=&r" (r7), \
|
||||
+ "=&r" (r8), "=&r" (r9), "=&r" (r10), "=&r" (r11), "=&r" (r12) \
|
||||
+ : ASM_INPUT_##nr \
|
||||
+ : "cr0", "ctr", "memory"); \
|
||||
+ err = r0; \
|
||||
+ (int) r3; \
|
||||
+ })
|
||||
+# define INTERNAL_SYSCALL(name, err, nr, args...) \
|
||||
+ INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_ERROR_P
|
||||
+# define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
||||
+ ((void) (val), __builtin_expect ((err) & (1 << 28), 0))
|
||||
+
|
||||
+# undef INTERNAL_SYSCALL_ERRNO
|
||||
+# define INTERNAL_SYSCALL_ERRNO(val, err) (val)
|
||||
+
|
||||
+# define LOADARGS_0(name, dummy) \
|
||||
+ r0 = (long int)name
|
||||
+# define LOADARGS_1(name, __arg1) \
|
||||
+ LOADARGS_0(name, 0); \
|
||||
+ r3 = (long int)__arg1
|
||||
+# define LOADARGS_2(name, __arg1, __arg2) \
|
||||
+ LOADARGS_1(name, __arg1); \
|
||||
+ r4 = (long int)__arg2
|
||||
+# define LOADARGS_3(name, __arg1, __arg2, __arg3) \
|
||||
+ LOADARGS_2(name, __arg1, __arg2); \
|
||||
+ r5 = (long int)__arg3
|
||||
+# define LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4) \
|
||||
+ LOADARGS_3(name, __arg1, __arg2, __arg3); \
|
||||
+ r6 = (long int)__arg4
|
||||
+# define LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5) \
|
||||
+ LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4); \
|
||||
+ r7 = (long int)__arg5
|
||||
+# define LOADARGS_6(name, __arg1, __arg2, __arg3, __arg4, __arg5, __arg6) \
|
||||
+ LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5); \
|
||||
+ r8 = (long int)__arg6
|
||||
+
|
||||
+# define ASM_INPUT_0 "0" (r0)
|
||||
+# define ASM_INPUT_1 ASM_INPUT_0, "1" (r3)
|
||||
+# define ASM_INPUT_2 ASM_INPUT_1, "2" (r4)
|
||||
+# define ASM_INPUT_3 ASM_INPUT_2, "3" (r5)
|
||||
+# define ASM_INPUT_4 ASM_INPUT_3, "4" (r6)
|
||||
+# define ASM_INPUT_5 ASM_INPUT_4, "5" (r7)
|
||||
+# define ASM_INPUT_6 ASM_INPUT_5, "6" (r8)
|
||||
|
||||
#undef _syscall0
|
||||
-#define _syscall0(type,name) \
|
||||
-type name(void); \
|
||||
-unified_syscall_body(name)
|
||||
+#define _syscall0(type,name) \
|
||||
+type name(void){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 0); \
|
||||
+}
|
||||
|
||||
#undef _syscall1
|
||||
#define _syscall1(type,name,type1,arg1) \
|
||||
-type name(type1 arg1); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 1, arg1); \
|
||||
+}
|
||||
|
||||
#undef _syscall2
|
||||
#define _syscall2(type,name,type1,arg1,type2,arg2) \
|
||||
-type name(type1 arg1, type2 arg2); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1, type2 arg2){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 2, arg1, arg2); \
|
||||
+}
|
||||
|
||||
#undef _syscall3
|
||||
#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
|
||||
-type name(type1 arg1, type2 arg2, type3 arg3); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1, type2 arg2, type3 arg3){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 3, arg1, arg2, arg3); \
|
||||
+}
|
||||
|
||||
#undef _syscall4
|
||||
#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
|
||||
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 4, arg1, arg2, arg3, arg4); \
|
||||
+}
|
||||
|
||||
#undef _syscall5
|
||||
#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
|
||||
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 5, arg1, arg2, arg3, arg4, arg5); \
|
||||
+}
|
||||
|
||||
#undef _syscall6
|
||||
#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
|
||||
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6); \
|
||||
-unified_syscall_body(name)
|
||||
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6){ \
|
||||
+ return (type) INLINE_SYSCALL(name, 6, arg1, arg2, arg3, arg4, arg5, arg6); \
|
||||
+}
|
||||
|
||||
#endif /* _BITS_SYSCALLS_H */
|
||||
|
||||
diff -urP uClibc-0.9.28/libc/sysdeps/linux/powerpc/sys/procfs.h uClibc-0.9.28-uint128/libc/sysdeps/linux/powerpc/sys/procfs.h
|
||||
--- uClibc-0.9.28/libc/sysdeps/linux/powerpc/sys/procfs.h 2005-08-18 00:49:41.000000000 +0200
|
||||
+++ uClibc-0.9.28-uint128/libc/sysdeps/linux/powerpc/sys/procfs.h 2005-08-22 17:27:17.000000000 +0200
|
||||
@@ -42,15 +42,10 @@
|
||||
typedef double elf_fpreg_t;
|
||||
typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
|
||||
|
||||
-/* gcc 3.1 and newer support __uint128_t. */
|
||||
-#if !__GNUC_PREREQ(3,1)
|
||||
-typedef struct {
|
||||
- unsigned long u[4];
|
||||
-} __attribute((aligned(16))) __uint128_t;
|
||||
-#endif
|
||||
-
|
||||
/* Altivec registers */
|
||||
-typedef __uint128_t elf_vrreg_t;
|
||||
+typedef struct {
|
||||
+ unsigned int u[4];
|
||||
+} __attribute((aligned (16))) elf_vrreg_t;
|
||||
typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
|
||||
|
||||
struct elf_siginfo
|
Loading…
Reference in New Issue
Block a user