From: Thomas Langer Date: Thu, 20 Nov 2008 18:31:00 +0000 (+0000) Subject: some cleanups: - fix CPUID detection - update MTD map for checks and sysupgrade ... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1bc6841c8dff78e1b8bafb53dbea352b56a56d65;p=openwrt%2Fstaging%2Fflorian.git some cleanups: - fix CPUID detection - update MTD map for checks and sysupgrade - enable subtargets (Generic&NFS) for simpler development - generic cleanups (e.g. from linux checkpatch.pl) SVN-Revision: 13295 --- diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile index a42b327921..a04f19db72 100644 --- a/target/linux/ifxmips/Makefile +++ b/target/linux/ifxmips/Makefile @@ -10,6 +10,7 @@ ARCH:=mips BOARD:=ifxmips BOARDNAME:=Infineon Mips FEATURES:=squashfs jffs2 +SUBTARGETS:=generic nfs LINUX_VERSION:=2.6.26.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ifxmips/base-files/lib/upgrade/platform.sh b/target/linux/ifxmips/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..247ba1a25c --- /dev/null +++ b/target/linux/ifxmips/base-files/lib/upgrade/platform.sh @@ -0,0 +1,25 @@ +PART_NAME=linux + +platform_check_image() { + [ "$ARGC" -gt 1 ] && return 1 + + case "$(get_magic_word "$1")" in + # .trx files + 2705) return 0;; + *) + echo "Invalid image type" + return 1 + ;; + esac +} + +# use default for platform_do_upgrade() + +disable_watchdog() { + killall watchdog + ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { + echo 'Could not disable watchdog' + return 1 + } +} +append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/ifxmips/config-2.6.26 b/target/linux/ifxmips/config-2.6.26 index 9b506672ec..d9d98ea6f1 100644 --- a/target/linux/ifxmips/config-2.6.26 +++ b/target/linux/ifxmips/config-2.6.26 @@ -132,7 +132,7 @@ CONFIG_MTD_CFI_NOSWAP=y # CONFIG_MTD_CFI_STAA is not set CONFIG_MTD_CFI_UTIL=y CONFIG_MTD_CHAR=y -# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_CONCAT is not set # CONFIG_MTD_DEBUG is not set @@ -154,10 +154,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_PCI is not set # CONFIG_MTD_PHRAM is not set -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_PHYSMAP_BANKWIDTH=0 -CONFIG_MTD_PHYSMAP_LEN=0x0 -CONFIG_MTD_PHYSMAP_START=0x0 +# CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_RAM is not set @@ -177,7 +174,7 @@ CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y # CONFIG_PCIPCWATCHDOG is not set CONFIG_PCI_DOMAINS=y -CONFIG_PCSPKR_PLATFORM=y +# CONFIG_PCSPKR_PLATFORM is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set @@ -206,6 +203,7 @@ CONFIG_SERIAL_IFXMIPS=y # CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_SSB_POSSIBLE=y +# CONFIG_SWAP is not set CONFIG_SWAP_IO_SPACE=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y @@ -224,13 +222,11 @@ CONFIG_TRAD_SIGNALS=y CONFIG_USB=m # CONFIG_USB_DWC_HCD is not set # CONFIG_USB_EHCI_HCD is not set -# CONFIG_USB_ISIGHTFW is not set CONFIG_USB_SUPPORT=y # CONFIG_USB_UHCI_HCD is not set # CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set CONFIG_VIDEO_MEDIA=m -CONFIG_VIDEO_V4L1=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c index 86a2595fad..d8f1907614 100644 --- a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c +++ b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c @@ -13,7 +13,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * Copyright (C) 2007 John Crispin + * Copyright (C) 2007 John Crispin */ #include @@ -27,23 +27,23 @@ #include #include #include +#include +#include +#include +#include #include -#include -#include #include -#include -#include #include #define MAX_BOARD_NAME_LEN 32 #define MAX_IFXMIPS_DEVS 9 #define SYSTEM_DANUBE "Danube" -#define SYSTEM_DANUBE_CHIPID1 0x10129083 -#define SYSTEM_DANUBE_CHIPID2 0x3012B083 +#define SYSTEM_DANUBE_CHIPID1 0x00129083 +#define SYSTEM_DANUBE_CHIPID2 0x0012B083 #define SYSTEM_TWINPASS "Twinpass" -#define SYSTEM_TWINPASS_CHIPID 0x3012D083 +#define SYSTEM_TWINPASS_CHIPID 0x0012D083 enum { EASY50712, @@ -54,7 +54,7 @@ enum { extern int ifxmips_pci_external_clock; static unsigned int chiprev; -static int cmdline_mac = 0; +static int cmdline_mac; char board_name[MAX_BOARD_NAME_LEN + 1] = { 0 }; struct ifxmips_board { @@ -73,14 +73,12 @@ struct ifxmips_board { spinlock_t ebu_lock = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL_GPL(ebu_lock); -static unsigned char ifxmips_mii_mac[6]; -static int ifxmips_brn = 0; +static unsigned char ifxmips_ethaddr[6]; +static int ifxmips_brn; static struct gpio_led_platform_data ifxmips_led_data; -static struct platform_device -ifxmips_led = -{ +static struct platform_device ifxmips_led = { .id = 0, .name = "ifxmips_led", .dev = { @@ -88,49 +86,39 @@ ifxmips_led = } }; -static struct platform_device -ifxmips_gpio = -{ +static struct platform_device ifxmips_gpio = { .id = 0, .name = "ifxmips_gpio", .num_resources = 1, }; -static struct platform_device -ifxmips_mii = -{ +static struct platform_device ifxmips_mii = { .id = 0, .name = "ifxmips_mii0", .dev = { - .platform_data = ifxmips_mii_mac, + .platform_data = ifxmips_ethaddr, } }; -static struct platform_device -ifxmips_wdt = -{ +static struct platform_device ifxmips_wdt = { .id = 0, .name = "ifxmips_wdt", }; -static struct resource -ifxmips_mtd_resource = { +static struct resource ifxmips_mtd_resource = { .start = IFXMIPS_FLASH_START, .end = IFXMIPS_FLASH_START + IFXMIPS_FLASH_MAX - 1, .flags = IORESOURCE_MEM, }; -static struct platform_device -ifxmips_mtd = -{ +static struct platform_device ifxmips_mtd = { .id = 0, .name = "ifxmips_mtd", .num_resources = 1, .resource = &ifxmips_mtd_resource, }; -static struct platform_device -ifxmips_gpio_dev = { +static struct platform_device ifxmips_gpio_dev = { .name = "GPIODEV", .id = -1, .num_resources = 1, @@ -154,7 +142,7 @@ static struct platform_device ifxmips_gpio_leds = { .id = -1, .dev = { .platform_data = (void *) &ifxmips_gpio_led_data, - } + } }; #endif @@ -189,15 +177,15 @@ static struct gpio_led easy4010_leds[] = { { .name = "ifx:green:test3", .gpio = 3,}, }; -static struct ifxmips_board boards[] = -{ +static struct ifxmips_board boards[] = { { .type = EASY50712, .name = "EASY50712", .system_type = SYSTEM_DANUBE_CHIPID1, .devs = easy50712_devs, .reset_resource = {.name = "reset", .start = 1, .end = 15,}, - .gpiodev_resource = {.name = "gpio", .start = (1 << 0) | (1 << 1), + .gpiodev_resource = { .name = "gpio", + .start = (1 << 0) | (1 << 1), .end = (1 << 0) | (1 << 1)}, .ifxmips_leds = easy50712_leds, }, { @@ -206,7 +194,8 @@ static struct ifxmips_board boards[] = .system_type = SYSTEM_TWINPASS_CHIPID, .devs = easy4010_devs, .reset_resource = {.name = "reset", .start = 1, .end = 15}, - .gpiodev_resource = {.name = "gpio", .start = (1 << 0) | (1 << 1), + .gpiodev_resource = { .name = "gpio", + .start = (1 << 0) | (1 << 1), .end = (1 << 0) | (1 << 1)}, .ifxmips_leds = easy4010_leds, }, { @@ -220,12 +209,11 @@ static struct ifxmips_board boards[] = }, }; -const char* -get_system_type(void) +const char *get_system_type(void) { - chiprev = ifxmips_r32(IFXMIPS_MPS_CHIPID); - switch(chiprev) - { + chiprev = (ifxmips_r32(IFXMIPS_MPS_CHIPID) & 0x0FFFFFFF); + + switch (chiprev) { case SYSTEM_DANUBE_CHIPID1: case SYSTEM_DANUBE_CHIPID2: return SYSTEM_DANUBE; @@ -237,100 +225,99 @@ get_system_type(void) return BOARD_SYSTEM_TYPE; } -static int __init -ifxmips_set_board_type(char *str) +static int __init ifxmips_set_board_type(char *str) { str = strchr(str, '='); - if(!str) + if (!str) goto out; str++; - if(strlen(str) > MAX_BOARD_NAME_LEN) + if (strlen(str) > MAX_BOARD_NAME_LEN) goto out; strncpy(board_name, str, MAX_BOARD_NAME_LEN); - printk("bootloader told us, that this is a %s board\n", board_name); + printk(KERN_INFO "bootloader told us, that this is a %s board\n", + board_name); out: return 1; } __setup("ifxmips_board", ifxmips_set_board_type); -static int __init -ifxmips_set_mii0_mac(char *str) +static int __init ifxmips_set_ethaddr(char *str) { #define IS_HEX(x) \ - (((x >='0' && x <= '9') || (x >='a' && x <= 'f') || (x >='A' && x <= 'F'))?(1):(0)) + (((x >= '0' && x <= '9') || (x >= 'a' && x <= 'f') \ + || (x >= 'A' && x <= 'F'))?(1):(0)) int i; str = strchr(str, '='); - if(!str) + if (!str) goto out; str++; - if(strlen(str) != 17) + if (strlen(str) != 17) goto out; - for(i = 0; i < 6; i++) - { - if(!IS_HEX(str[3 * i]) || !IS_HEX(str[(3 * i) + 1])) + for (i = 0; i < 6; i++) { + if (!IS_HEX(str[3 * i]) || !IS_HEX(str[(3 * i) + 1])) goto out; - if((i != 5) && (str[(3 * i) + 2] != ':')) + if ((i != 5) && (str[(3 * i) + 2] != ':')) goto out; - ifxmips_mii_mac[i] = simple_strtoul(&str[3 * i], NULL, 16); + ifxmips_ethaddr[i] = strict_strtoul(&str[3 * i], NULL, 16); } - if(is_valid_ether_addr(ifxmips_mii_mac)) + if (is_valid_ether_addr(ifxmips_ethaddr)) cmdline_mac = 1; out: return 1; } -__setup("mii0_mac", ifxmips_set_mii0_mac); +__setup("ethaddr", ifxmips_set_ethaddr); -int -ifxmips_find_brn_block(void){ +int ifxmips_find_brn_block(void) +{ unsigned char temp[8]; - memcpy_fromio(temp, (void*)KSEG1ADDR(IFXMIPS_FLASH_START + 0x800000 - 0x10000), 8); - if(memcmp(temp, "BRN-BOOT", 8) == 0) - { - if(!cmdline_mac) - memcpy_fromio(ifxmips_mii_mac, (void*)KSEG1ADDR(IFXMIPS_FLASH_START + 0x800000 - 0x10000 + 0x16), 6); - cmdline_mac = 1; + memcpy_fromio(temp, + (void *)KSEG1ADDR(IFXMIPS_FLASH_START + 0x800000 - 0x10000), 8); + if (memcmp(temp, "BRN-BOOT", 8) == 0) { + if (!cmdline_mac) + memcpy_fromio(ifxmips_ethaddr, + (void *)KSEG1ADDR(IFXMIPS_FLASH_START + + 0x800000 - 0x10000 + 0x16), 6); + if (is_valid_ether_addr(ifxmips_ethaddr)) + cmdline_mac = 1; return 1; } else { return 0; } } -int -ifxmips_has_brn_block(void) +int ifxmips_has_brn_block(void) { return ifxmips_brn; } EXPORT_SYMBOL(ifxmips_has_brn_block); -struct ifxmips_board* -ifxmips_find_board(void) +struct ifxmips_board *ifxmips_find_board(void) { int i; - if(!*board_name) + if (!*board_name) return 0; - for(i = 0; i < ARRAY_SIZE(boards); i++) - if((boards[i].system_type == chiprev) && (!strcmp(boards[i].name, board_name))) + for (i = 0; i < ARRAY_SIZE(boards); i++) + if ((boards[i].system_type == chiprev) && + (!strcmp(boards[i].name, board_name))) return &boards[i]; return 0; } -int __init -ifxmips_init_devices(void) +int __init ifxmips_init_devices(void) { struct ifxmips_board *board = ifxmips_find_board(); - chiprev = ifxmips_r32(IFXMIPS_MPS_CHIPID); + chiprev = (ifxmips_r32(IFXMIPS_MPS_CHIPID) & 0x0FFFFFFF); ifxmips_brn = ifxmips_find_brn_block(); - if(!cmdline_mac) - random_ether_addr(ifxmips_mii_mac); + if (!cmdline_mac) + random_ether_addr(ifxmips_ethaddr); - if(!board) - { - switch(chiprev) - { + if (!board) { + switch (chiprev) { case SYSTEM_DANUBE_CHIPID1: case SYSTEM_DANUBE_CHIPID2: + default: board = &boards[0]; break; case SYSTEM_TWINPASS_CHIPID: @@ -339,8 +326,7 @@ ifxmips_init_devices(void) } } - switch(board->type) - { + switch (board->type) { case EASY50712: board->num_devs = ARRAY_SIZE(easy50712_devs); ifxmips_led_data.num_leds = ARRAY_SIZE(easy50712_leds); @@ -368,13 +354,14 @@ ifxmips_init_devices(void) #endif ifxmips_led_data.leds = board->ifxmips_leds; - printk("%s:%s[%d]adding %d devs\n", __FILE__, __func__, __LINE__, board->num_devs); + printk(KERN_INFO "%s:%s[%d]adding %d devs\n", + __FILE__, __func__, __LINE__, board->num_devs); ifxmips_gpio.resource = &board->reset_resource; ifxmips_gpio_dev.resource = &board->gpiodev_resource; - if(board->pci_external_clock) + if (board->pci_external_clock) ifxmips_pci_external_clock = 1; - printk("using board definition %s\n", board->name); + printk(KERN_INFO "using board definition %s\n", board->name); return platform_add_devices(board->devs, board->num_devs); } diff --git a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c index 97efa37dd1..d492dada5b 100644 --- a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c +++ b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c @@ -173,7 +173,7 @@ pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin){ } } -int +int __init pcibios_init(void) { extern int pci_probe_only; diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c index b3692e72a0..aed241b983 100644 --- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c +++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c @@ -3,7 +3,7 @@ * 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 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,126 +32,143 @@ #include #include -static struct map_info -ifxmips_map = { - .name = "ifxmips_mtd", +#ifndef CONFIG_MTD_PARTITIONS +#error Please enable CONFIG_MTD_PARTITIONS +#endif + +static struct map_info ifxmips_map = { + .name = "ifx-nor", .bankwidth = 2, .size = 0x400000, }; -static map_word -ifxmips_read16(struct map_info * map, unsigned long adr) +static map_word ifxmips_read16(struct map_info *map, unsigned long adr) { unsigned long flags; map_word temp; spin_lock_irqsave(&ebu_lock, flags); adr ^= 2; - temp.x[0] = *((__u16*)(map->virt + adr)); + temp.x[0] = *((__u16 *)(map->virt + adr)); spin_unlock_irqrestore(&ebu_lock, flags); return temp; } -static void -ifxmips_write16(struct map_info *map, map_word d, unsigned long adr) +static void ifxmips_write16(struct map_info *map, map_word d, unsigned long adr) { unsigned long flags; spin_lock_irqsave(&ebu_lock, flags); adr ^= 2; - *((__u16*)(map->virt + adr)) = d.x[0]; + *((__u16 *)(map->virt + adr)) = d.x[0]; spin_unlock_irqrestore(&ebu_lock, flags); } -void -ifxmips_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) +void ifxmips_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) { unsigned char *p; unsigned char *to_8; unsigned long flags; spin_lock_irqsave(&ebu_lock, flags); from = (unsigned long)(from + map->virt); - p = (unsigned char*) from; - to_8 = (unsigned char*) to; - while(len--) + p = (unsigned char *) from; + to_8 = (unsigned char *) to; + while (len--) *to_8++ = *p++; spin_unlock_irqrestore(&ebu_lock, flags); } -void -ifxmips_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) +void ifxmips_copy_to(struct map_info *map, + unsigned long to, + const void *from, + ssize_t len) { - unsigned char *p = (unsigned char*)from; + unsigned char *p = (unsigned char *)from; unsigned char *to_8; unsigned long flags; spin_lock_irqsave(&ebu_lock, flags); to += (unsigned long) map->virt; - to_8 = (unsigned char*)to; - while(len--) + to_8 = (unsigned char *)to; + while (len--) *p++ = *to_8++; spin_unlock_irqrestore(&ebu_lock, flags); } -static struct mtd_partition -ifxmips_partitions[] = { +static struct mtd_partition ifxmips_partitions[] = { { - name:"uboot", - offset:0x00000000, - size:0x00020000, + .name = "uboot", + .offset = 0x00000000, + .size = 0x00020000, }, { - name:"uboot_env", - offset:0x00020000, - size:0x00010000, + .name = "uboot_env", + .offset = 0x00020000, + .size = 0x00010000, }, { - name:"kernel", - offset:0x00030000, - size:0x0, + .name = "kernel", + .offset = 0x00030000, + .size = 0x0, }, { - name:"rootfs", - offset:0x0, - size:0x0, + .name = "rootfs", + .offset = 0x0, + .size = 0x0, }, { - name:"board_config", - offset:0x0, - size:0x0, + .name = "board_config", + .offset = 0x0, + .size = 0x0, }, }; -int -find_uImage_size(unsigned long start_offset){ +static struct mtd_partition ifxmips_meta_partition = { + .name = "linux", + .offset = 0x00030000, + .size = 0x0, +}; + +static const char *part_probe_types[] = { "cmdlinepart", NULL }; + +int find_uImage_size(unsigned long start_offset) +{ + unsigned long magic; unsigned long temp; + ifxmips_copy_from(&ifxmips_map, &magic, start_offset, 4); + if (!(ntohl(magic) == 0x27051956)) { + printk(KERN_INFO "ifxmips_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", ntohl(magic), start_offset); + return 0; + } ifxmips_copy_from(&ifxmips_map, &temp, start_offset + 12, 4); printk(KERN_INFO "ifxmips_mtd: kernel size is %ld \n", temp + 0x40); return temp + 0x40; } -int -find_brn_block(unsigned long start_offset){ +int find_brn_block(unsigned long start_offset) +{ unsigned char temp[9]; ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 8); temp[8] = '\0'; printk(KERN_INFO "data in brn block %s\n", temp); - if(memcmp(temp, "BRN-BOOT", 8) == 0) + if (memcmp(temp, "BRN-BOOT", 8) == 0) return 1; else return 0; } -int -detect_squashfs_partition(unsigned long start_offset){ +int detect_squashfs_partition(unsigned long start_offset) +{ unsigned long temp; ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4); - return (temp == SQUASHFS_MAGIC); + return temp == SQUASHFS_MAGIC; } -static int -ifxmips_mtd_probe(struct platform_device *dev) +static int ifxmips_mtd_probe(struct platform_device *dev) { struct mtd_info *ifxmips_mtd = NULL; struct mtd_partition *parts = NULL; unsigned long uimage_size; + int err, i; + int kernel_part = 2, rootfs_part = 3; + int num_parts = ARRAY_SIZE(ifxmips_partitions); ifxmips_w32(0x1d7ff, IFXMIPS_EBU_BUSCON0); @@ -163,51 +180,74 @@ ifxmips_mtd_probe(struct platform_device *dev) ifxmips_map.size = dev->resource->end - ifxmips_map.phys + 1; ifxmips_map.virt = ioremap_nocache(ifxmips_map.phys, ifxmips_map.size); - if(!ifxmips_map.virt) - { + if (!ifxmips_map.virt) { printk(KERN_WARNING "ifxmips_mtd: failed to ioremap!\n"); return -EIO; } ifxmips_mtd = (struct mtd_info *) do_map_probe("cfi_probe", &ifxmips_map); - if(!ifxmips_mtd) - { + if (!ifxmips_mtd) { iounmap(ifxmips_map.virt); printk(KERN_WARNING "ifxmips_mtd: probing failed\n"); return -ENXIO; } ifxmips_mtd->owner = THIS_MODULE; - uimage_size = find_uImage_size(ifxmips_partitions[2].offset); - if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size)) - { - printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n"); + err = parse_mtd_partitions(ifxmips_mtd, part_probe_types, &parts, 0); + if (err > 0) { + printk(KERN_INFO "ifxmips_mtd: found %d partitions from cmdline\n", err); + num_parts = err; + kernel_part = 0; + rootfs_part = 0; + for (i = 0; i < num_parts; i++) { + if (strcmp(parts[i].name, "kernel") == 0) + kernel_part = i; + if (strcmp(parts[i].name, "rootfs") == 0) + rootfs_part = i; + } } else { - uimage_size &= ~0xffff; - uimage_size += 0x10000; + parts = &ifxmips_partitions[0]; } - parts = &ifxmips_partitions[0]; - ifxmips_partitions[2].size = uimage_size; - ifxmips_partitions[3].offset = ifxmips_partitions[2].offset + ifxmips_partitions[2].size; - ifxmips_partitions[3].size = ((ifxmips_mtd->size >> 20) * 1024 * 1024) - ifxmips_partitions[3].offset; - if(ifxmips_has_brn_block()) - { - ifxmips_partitions[3].size -= ifxmips_mtd->erasesize; - ifxmips_partitions[4].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize; - ifxmips_partitions[4].size = ifxmips_mtd->erasesize; - add_mtd_partitions(ifxmips_mtd, parts, 5); - } else { - add_mtd_partitions(ifxmips_mtd, parts, 4); + /* dynamic size detection only if rootfs-part follows kernel-part */ + if (kernel_part+1 == rootfs_part) { + uimage_size = find_uImage_size(parts[kernel_part].offset); + + if (detect_squashfs_partition(parts[kernel_part].offset + uimage_size)) { + printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n"); + } else { + uimage_size &= ~0xffff; + uimage_size += 0x10000; + } + + parts[kernel_part].size = uimage_size; + parts[rootfs_part].offset = parts[kernel_part].offset + parts[kernel_part].size; + parts[rootfs_part].size = ((ifxmips_mtd->size >> 20) * 1024 * 1024) - parts[rootfs_part].offset; + + ifxmips_meta_partition.offset = parts[kernel_part].offset; + ifxmips_meta_partition.size = parts[kernel_part].size + parts[rootfs_part].size; } - printk(KERN_INFO "ifxmips_mtd: added ifxmips flash with %dMB\n", ifxmips_mtd->size >> 20); + if (err <= 0) { + if (ifxmips_has_brn_block()) { + parts[4].size -= ifxmips_mtd->erasesize; + parts[5].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize; + parts[5].size = ifxmips_mtd->erasesize; + } else { + num_parts--; + } + } + + add_mtd_partitions(ifxmips_mtd, parts, num_parts); + add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1); + + printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n", + ifxmips_map.name, ifxmips_mtd->size >> 20); return 0; } -static struct -platform_driver ifxmips_mtd_driver = { +static struct platform_driver ifxmips_mtd_driver = { .probe = ifxmips_mtd_probe, .driver = { .name = "ifxmips_mtd", @@ -215,17 +255,15 @@ platform_driver ifxmips_mtd_driver = { }, }; -int __init -init_ifxmips_mtd(void) +int __init init_ifxmips_mtd(void) { int ret = platform_driver_register(&ifxmips_mtd_driver); - if(ret) + if (ret) printk(KERN_INFO "ifxmips_mtd: error registering platfom driver!"); return ret; } -static void __exit -cleanup_ifxmips_mtd(void) +static void __exit cleanup_ifxmips_mtd(void) { platform_driver_unregister(&ifxmips_mtd_driver); } diff --git a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c index fe7f25ec2a..fafb5a52fe 100644 --- a/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c +++ b/target/linux/ifxmips/files/drivers/net/ifxmips_mii0.c @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * * Copyright (C) 2005 Wu Qi Ming - * Copyright (C) 2008 John Crispin + * Copyright (C) 2008 John Crispin */ #include @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,9 +32,9 @@ #include #include #include -#include #include -#include +#include +#include #include #include #include @@ -83,9 +83,9 @@ ifxmips_ifxmips_mii_open(struct net_device *dev) struct dma_device_info* dma_dev = priv->dma_device; int i; - for(i = 0; i < dma_dev->max_rx_chan_num; i++) + for (i = 0; i < dma_dev->max_rx_chan_num; i++) { - if((dma_dev->rx_chan[i])->control == IFXMIPS_DMA_CH_ON) + if ((dma_dev->rx_chan[i])->control == IFXMIPS_DMA_CH_ON) (dma_dev->rx_chan[i])->open(dma_dev->rx_chan[i]); } netif_start_queue(dev); @@ -98,7 +98,7 @@ ifxmips_mii_release(struct net_device *dev){ struct dma_device_info* dma_dev = priv->dma_device; int i; - for(i = 0; i < dma_dev->max_rx_chan_num; i++) + for (i = 0; i < dma_dev->max_rx_chan_num; i++) dma_dev->rx_chan[i]->close(dma_dev->rx_chan[i]); netif_stop_queue(dev); return 0; @@ -114,7 +114,7 @@ ifxmips_mii_hw_receive(struct net_device* dev,struct dma_device_info* dma_dev) len = dma_device_read(dma_dev, &buf, (void**)&skb); - if(len >= ETHERNET_PACKET_DMA_BUFFER_SIZE) + if (len >= ETHERNET_PACKET_DMA_BUFFER_SIZE) { printk(KERN_INFO "ifxmips_mii0: packet too large %d\n",len); goto ifxmips_mii_hw_receive_err_exit; @@ -122,13 +122,13 @@ ifxmips_mii_hw_receive(struct net_device* dev,struct dma_device_info* dma_dev) /* remove CRC */ len -= 4; - if(skb == NULL) + if (skb == NULL) { printk(KERN_INFO "ifxmips_mii0: cannot restore pointer\n"); goto ifxmips_mii_hw_receive_err_exit; } - if(len > (skb->end - skb->tail)) + if (len > (skb->end - skb->tail)) { printk(KERN_INFO "ifxmips_mii0: BUG, len:%d end:%p tail:%p\n", (len+4), skb->end, skb->tail); @@ -145,9 +145,9 @@ ifxmips_mii_hw_receive(struct net_device* dev,struct dma_device_info* dma_dev) return 0; ifxmips_mii_hw_receive_err_exit: - if(len == 0) + if (len == 0) { - if(skb) + if (skb) dev_kfree_skb_any(skb); priv->stats.rx_errors++; priv->stats.rx_dropped++; @@ -185,7 +185,7 @@ ifxmips_mii_tx(struct sk_buff *skb, struct net_device *dev) wmb(); - if(ifxmips_mii_hw_tx(data, len, dev) != len) + if (ifxmips_mii_hw_tx(data, len, dev) != len) { dev_kfree_skb_any(skb); priv->stats.tx_errors++; @@ -205,7 +205,7 @@ ifxmips_mii_tx_timeout(struct net_device *dev) struct ifxmips_mii_priv* priv = (struct ifxmips_mii_priv*)dev->priv; priv->stats.tx_errors++; - for(i = 0; i < priv->dma_device->max_tx_chan_num; i++) + for (i = 0; i < priv->dma_device->max_tx_chan_num; i++) priv->dma_device->tx_chan[i]->disable_irq(priv->dma_device->tx_chan[i]); netif_wake_queue(dev); return; @@ -233,7 +233,7 @@ dma_intr_handler(struct dma_device_info* dma_dev, int status) break; case TRANSMIT_CPT_INT: - for(i = 0; i < dma_dev->max_tx_chan_num; i++) + for (i = 0; i < dma_dev->max_tx_chan_num; i++) dma_dev->tx_chan[i]->disable_irq(dma_dev->tx_chan[i]); netif_wake_queue(ifxmips_mii0_dev); @@ -250,7 +250,7 @@ ifxmips_etop_dma_buffer_alloc(int len, int *byte_offset, void **opt) struct sk_buff *skb = NULL; skb = dev_alloc_skb(ETHERNET_PACKET_DMA_BUFFER_SIZE); - if(skb == NULL) + if (skb == NULL) return NULL; buffer = (unsigned char*)(skb->data); @@ -266,7 +266,7 @@ ifxmips_etop_dma_buffer_free(unsigned char *dataptr, void *opt) { struct sk_buff *skb = NULL; - if(opt == NULL) + if (opt == NULL) { kfree(dataptr); } else { @@ -298,7 +298,7 @@ ifxmips_mii_dev_init(struct net_device *dev) memset(dev->priv, 0, sizeof(struct ifxmips_mii_priv)); priv = dev->priv; priv->dma_device = dma_device_reserve("PPE"); - if(!priv->dma_device){ + if (!priv->dma_device){ BUG(); return -ENODEV; } @@ -307,14 +307,14 @@ ifxmips_mii_dev_init(struct net_device *dev) priv->dma_device->intr_handler = &dma_intr_handler; priv->dma_device->max_rx_chan_num = 4; - for(i = 0; i < priv->dma_device->max_rx_chan_num; i++) + for (i = 0; i < priv->dma_device->max_rx_chan_num; i++) { priv->dma_device->rx_chan[i]->packet_size = ETHERNET_PACKET_DMA_BUFFER_SIZE; priv->dma_device->rx_chan[i]->control = IFXMIPS_DMA_CH_ON; } - for(i = 0; i < priv->dma_device->max_tx_chan_num; i++) - if(i == 0) + for (i = 0; i < priv->dma_device->max_tx_chan_num; i++) + if (i == 0) priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_ON; else priv->dma_device->tx_chan[i]->control = IFXMIPS_DMA_CH_OFF; @@ -322,7 +322,7 @@ ifxmips_mii_dev_init(struct net_device *dev) dma_device_register(priv->dma_device); printk(KERN_INFO "ifxmips_mii0: using mac="); - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { dev->dev_addr[i] = mac_addr[i]; printk("%02X%c", dev->dev_addr[i], (i == 5)?('\n'):(':')); @@ -336,9 +336,9 @@ ifxmips_mii_chip_init(int mode) ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_DMA); ifxmips_pmu_enable(IFXMIPS_PMU_PWDCR_PPE); - if(mode == REV_MII_MODE) + if (mode == REV_MII_MODE) ifxmips_w32_mask(PPE32_MII_MASK, PPE32_MII_REVERSE, IFXMIPS_PPE32_CFG); - else if(mode == MII_MODE) + else if (mode == MII_MODE) ifxmips_w32_mask(PPE32_MII_MASK, PPE32_MII_NORMAL, IFXMIPS_PPE32_CFG); ifxmips_w32(PPE32_PLEN_UNDER | PPE32_PLEN_OVER, IFXMIPS_PPE32_IG_PLEN_CTRL); ifxmips_w32(PPE32_CGEN, IFXMIPS_PPE32_ENET_MAC_CFG); diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h index 0dece372d1..761a31bb90 100644 --- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h +++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h @@ -32,7 +32,7 @@ static inline int gpio_direction_input(unsigned gpio) { ifxmips_port_set_open_drain(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio)); ifxmips_port_clear_altsel0(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio)); - ifxmips_port_clear_altsel1(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio)); + ifxmips_port_clear_altsel1(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio)); ifxmips_port_set_dir_in(GPIO_TO_PORT(gpio), GPIO_TO_GPIO(gpio)); return 0; } @@ -73,17 +73,17 @@ static inline int irq_to_gpio(unsigned irq) { } static inline int gpio_cansleep(unsigned gpio) { - return 0; + return 0; } static inline int gpio_get_value_cansleep(unsigned gpio) { - might_sleep(); - return gpio_get_value(gpio); + might_sleep(); + return gpio_get_value(gpio); } static inline void gpio_set_value_cansleep(unsigned gpio, int value) { - might_sleep(); - gpio_set_value(gpio, value); + might_sleep(); + gpio_set_value(gpio, value); } static inline int gpio_is_valid(int number) diff --git a/target/linux/ifxmips/generic/target.mk b/target/linux/ifxmips/generic/target.mk new file mode 100644 index 0000000000..dc7655093d --- /dev/null +++ b/target/linux/ifxmips/generic/target.mk @@ -0,0 +1,5 @@ +BOARDNAME:=Generic + +define Target/Description + Build standard images for Infineon CPE devices +endef diff --git a/target/linux/ifxmips/nfs/base-files/etc/config/network b/target/linux/ifxmips/nfs/base-files/etc/config/network new file mode 100644 index 0000000000..f2e8a5ecd5 --- /dev/null +++ b/target/linux/ifxmips/nfs/base-files/etc/config/network @@ -0,0 +1,7 @@ +# Copyright (C) 2006 OpenWrt.org + +config interface loopback + option ifname lo + option proto static + option ipaddr 127.0.0.1 + option netmask 255.0.0.0 diff --git a/target/linux/ifxmips/nfs/base-files/etc/preinit.arch b/target/linux/ifxmips/nfs/base-files/etc/preinit.arch new file mode 100755 index 0000000000..61662bc21d --- /dev/null +++ b/target/linux/ifxmips/nfs/base-files/etc/preinit.arch @@ -0,0 +1,3 @@ + +echo "- init nfs -" +exec /sbin/init diff --git a/target/linux/ifxmips/nfs/config-2.6.26 b/target/linux/ifxmips/nfs/config-2.6.26 new file mode 100644 index 0000000000..137af82d44 --- /dev/null +++ b/target/linux/ifxmips/nfs/config-2.6.26 @@ -0,0 +1,16 @@ +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MD5=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_RARP is not set +CONFIG_LOCKD=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y diff --git a/target/linux/ifxmips/nfs/target.mk b/target/linux/ifxmips/nfs/target.mk new file mode 100644 index 0000000000..8d454e2795 --- /dev/null +++ b/target/linux/ifxmips/nfs/target.mk @@ -0,0 +1,8 @@ +BOARDNAME:=NFS Root +FEATURES:=tgz +DEVICE_TYPE:=modem + +define Target/Description + Build images for Infineon CPE devices for NFS boot +endef + diff --git a/target/linux/ifxmips/profiles/000-None.mk b/target/linux/ifxmips/profiles/000-None.mk new file mode 100644 index 0000000000..5bfea2f7bf --- /dev/null +++ b/target/linux/ifxmips/profiles/000-None.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/None + NAME:=Generic, No WiFi + PACKAGES:= +endef + +define Profile/None/Description + Package set without WiFi support +endef +$(eval $(call Profile,None)) +