From 4b1dcdd4a5e2021a7da4710d06def10fb6ac6551 Mon Sep 17 00:00:00 2001 From: Mike Staszel Date: Sat, 1 Jan 2011 01:28:06 -0600 Subject: [PATCH] kernel26 LED patch --- ...ed-by-the-Seagate-FreeAgent-DockStar.patch | 15 - core/kernel26/LEDs.patch | 914 +++++++++++++++++- core/kernel26/PKGBUILD | 11 +- 3 files changed, 878 insertions(+), 62 deletions(-) delete mode 100644 core/kernel26/0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch diff --git a/core/kernel26/0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch b/core/kernel26/0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch deleted file mode 100644 index 66a88562e..000000000 --- a/core/kernel26/0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/arch/arm/mach-kirkwood/sheevaplug-setup.c -+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c -@@ -34,6 +34,10 @@ static struct mtd_partition sheevaplug_nand_parts[] = { - }, { - .name = "root", - .offset = MTDPART_OFS_NXTBLK, -+ .size = SZ_32M -+ }, { -+ .name = "data", -+ .offset = MTDPART_OFS_NXTBLK, - .size = MTDPART_SIZ_FULL - }, - }; --- -1.6.4.4 diff --git a/core/kernel26/LEDs.patch b/core/kernel26/LEDs.patch index 3e3138e13..fc40e7b73 100644 --- a/core/kernel26/LEDs.patch +++ b/core/kernel26/LEDs.patch @@ -1,43 +1,877 @@ ---- a/arch/arm/mach-kirkwood/sheevaplug-setup.c -+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c -@@ -61,12 +61,25 @@ - }; +diff -urN a//arch/arm/mach-kirkwood/dockstar-setup.c b//arch/arm/mach-kirkwood/dockstar-setup.c +--- a//arch/arm/mach-kirkwood/dockstar-setup.c 1969-12-31 17:00:00.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/dockstar-setup.c 2010-12-18 00:46:04.109176002 -0700 +@@ -0,0 +1,115 @@ ++/* ++ * arch/arm/mach-kirkwood/dockstar-setup.c ++ * ++ * Seagate Dockstar ++ * ++ * 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 ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition dockstar_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_32M ++ }, { ++ .name = "ubi", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data dockstar_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ ++static struct gpio_led dockstar_led_pins[] = { ++ { ++ .name = "status:green:health", ++ .default_trigger = "none", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { ++ .name = "status:orange:misc", ++ .default_trigger = "default-on", ++ .gpio = 47, ++ .active_low = 1, ++ } ++}; ++ ++static struct gpio_led_platform_data dockstar_led_data = { ++ .leds = dockstar_led_pins, ++ .num_leds = ARRAY_SIZE(dockstar_led_pins), ++}; ++ ++static struct platform_device dockstar_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &dockstar_led_data, ++ } ++}; ++ ++static unsigned int dockstar_mpp_config[] __initdata = { ++ MPP29_GPIO, /* USB Power Enable */ ++ MPP47_GPIO, /* LED Orange */ ++ MPP46_GPIO, /* LED Green */ ++ 0 ++}; ++ ++static void __init dockstar_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ ++ /* setup gpio pin select */ ++ kirkwood_mpp_conf(dockstar_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25); ++ ++ if (gpio_request(29, "USB Power Enable") != 0 || ++ gpio_direction_output(29, 1) != 0) ++ printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n"); ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&dockstar_ge00_data); ++ ++ platform_device_register(&dockstar_leds); ++} ++ ++MACHINE_START(DOCKSTAR, "Seagate Dockstar") ++ /* Maintainer: Peter Carmichael */ ++ .phys_io = KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, ++ .boot_params = 0x00000100, ++ .init_machine = dockstar_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = &kirkwood_timer, ++MACHINE_END +diff -urN a//arch/arm/mach-kirkwood/goflexnet-setup.c b//arch/arm/mach-kirkwood/goflexnet-setup.c +--- a//arch/arm/mach-kirkwood/goflexnet-setup.c 1969-12-31 17:00:00.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/goflexnet-setup.c 2010-12-18 00:50:13.369176001 -0700 +@@ -0,0 +1,121 @@ ++/* ++ * arch/arm/mach-kirkwood/goflexnet-setup.c ++ * ++ * Seagate Goflex Net Setup ++ * ++ * 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 ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition goflexnet_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "pogoplug", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_32M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data goflexnet_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ ++static struct mv_sata_platform_data goflexnet_sata_data = { ++ .n_ports = 2, ++}; ++ ++static struct gpio_led goflexnet_led_pins[] = { ++ { ++ .name = "status:green:health", ++ .default_trigger = "default-on", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { ++ .name = "status:orange:fault", ++ .default_trigger = "none", ++ .gpio = 47, ++ .active_low = 1, ++ } ++}; ++ ++static struct gpio_led_platform_data goflexnet_led_data = { ++ .leds = goflexnet_led_pins, ++ .num_leds = ARRAY_SIZE(goflexnet_led_pins), ++}; ++ ++static struct platform_device goflexnet_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &goflexnet_led_data, ++ } ++}; ++ ++static unsigned int goflexnet_mpp_config[] __initdata = { ++ MPP29_GPIO, /* USB Power Enable */ ++ MPP47_GPIO, /* LED Orange */ ++ MPP46_GPIO, /* LED Green */ ++ 0 ++}; ++ ++static void __init goflexnet_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ ++ /* setup gpio pin select */ ++ kirkwood_mpp_conf(goflexnet_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(goflexnet_nand_parts), 25); ++ ++ if (gpio_request(29, "USB Power Enable") != 0 || ++ gpio_direction_output(29, 1) != 0) ++ printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n"); ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&goflexnet_ge00_data); ++ kirkwood_sata_init(&goflexnet_sata_data); ++ ++ platform_device_register(&goflexnet_leds); ++} ++ ++MACHINE_START(GOFLEXNET, "Seagate Goflex Net") ++ /* Maintainer: Peter Carmichael */ ++ .phys_io = KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, ++ .boot_params = 0x00000100, ++ .init_machine = goflexnet_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = &kirkwood_timer, ++MACHINE_END ++ +diff -urN a//arch/arm/mach-kirkwood/guruplug-setup.c b//arch/arm/mach-kirkwood/guruplug-setup.c +--- a//arch/arm/mach-kirkwood/guruplug-setup.c 2010-12-09 15:17:27.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/guruplug-setup.c 2010-12-18 00:50:13.409176002 -0700 +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include "common.h" + #include "mpp.h" + +@@ -57,12 +56,14 @@ + + static struct gpio_led guruplug_led_pins[] = { + { +- .name = "guruplug:red:health", ++ .name = "status:red:fault", ++ .default_trigger = "none", + .gpio = 46, + .active_low = 1, + }, + { +- .name = "guruplug:green:health", ++ .name = "status:green:health", ++ .default_trigger = "default-on", + .gpio = 47, + .active_low = 1, + }, +diff -urN a//arch/arm/mach-kirkwood/Kconfig b//arch/arm/mach-kirkwood/Kconfig +--- a//arch/arm/mach-kirkwood/Kconfig 2010-12-09 15:17:27.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/Kconfig 2010-12-18 00:50:13.369176001 -0700 +@@ -58,6 +58,12 @@ + QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS + devices. + ++config MACH_GOFLEXNET ++ bool "Seagate GoFlex Net" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Seagate GoFlex Net. ++ + config MACH_OPENRD + bool + +diff -urN a//arch/arm/mach-kirkwood/Kconfig.orig b//arch/arm/mach-kirkwood/Kconfig.orig +--- a//arch/arm/mach-kirkwood/Kconfig.orig 1969-12-31 17:00:00.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/Kconfig.orig 2010-12-18 00:39:19.539176001 -0700 +@@ -0,0 +1,123 @@ ++if ARCH_KIRKWOOD ++ ++menu "Marvell Kirkwood Implementations" ++ ++config MACH_DB88F6281_BP ++ bool "Marvell DB-88F6281-BP Development Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell DB-88F6281-BP Development Board. ++ ++config MACH_RD88F6192_NAS ++ bool "Marvell RD-88F6192-NAS Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell RD-88F6192-NAS Reference Board. ++ ++config MACH_RD88F6281 ++ bool "Marvell RD-88F6281 Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell RD-88F6281 Reference Board. ++ ++config MACH_MV88F6281GTW_GE ++ bool "Marvell 88F6281 GTW GE Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell 88F6281 GTW GE Board. ++ ++config MACH_SHEEVAPLUG ++ bool "Marvell SheevaPlug Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell SheevaPlug Reference Board. ++ ++config MACH_ESATA_SHEEVAPLUG ++ bool "Marvell eSATA SheevaPlug Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell eSATA SheevaPlug Reference Board. ++ ++config MACH_GURUPLUG ++ bool "Marvell GuruPlug Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell GuruPlug Reference Board. ++ ++config MACH_TS219 ++ bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" ++ help ++ Say 'Y' here if you want your kernel to support the ++ QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS ++ devices. ++ ++config MACH_TS41X ++ bool "QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS" ++ help ++ Say 'Y' here if you want your kernel to support the ++ QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS ++ devices. ++ ++config MACH_OPENRD ++ bool ++ ++config MACH_OPENRD_BASE ++ bool "Marvell OpenRD Base Board" ++ select MACH_OPENRD ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell OpenRD Base Board. ++ ++config MACH_OPENRD_CLIENT ++ bool "Marvell OpenRD Client Board" ++ select MACH_OPENRD ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell OpenRD Client Board. ++ ++config MACH_OPENRD_ULTIMATE ++ bool "Marvell OpenRD Ultimate Board" ++ select MACH_OPENRD ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell OpenRD Ultimate Board. ++ ++config MACH_NETSPACE_V2 ++ bool "LaCie Network Space v2 NAS Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Network Space v2 NAS. ++ ++config MACH_INETSPACE_V2 ++ bool "LaCie Internet Space v2 NAS Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Internet Space v2 NAS. ++ ++config MACH_NETSPACE_MAX_V2 ++ bool "LaCie Network Space Max v2 NAS Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Network Space Max v2 NAS. ++ ++config MACH_NET2BIG_V2 ++ bool "LaCie 2Big Network v2 NAS Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie 2Big Network v2 NAS. ++ ++config MACH_NET5BIG_V2 ++ bool "LaCie 5Big Network v2 NAS Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie 5Big Network v2 NAS. ++ ++config MACH_T5325 ++ bool "HP t5325 Thin Client" ++ help ++ Say 'Y' here if you want your kernel to support the ++ HP t5325 Thin Client. ++ ++endmenu ++ ++endif +diff -urN a//arch/arm/mach-kirkwood/Makefile b//arch/arm/mach-kirkwood/Makefile +--- a//arch/arm/mach-kirkwood/Makefile 2010-12-09 15:17:27.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/Makefile 2010-12-18 00:50:13.369176001 -0700 +@@ -8,6 +8,7 @@ + obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o ++obj-$(CONFIG_MACH_GOFLEXNET) += goflexnet-setup.o + obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o + obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o + obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o +diff -urN a//arch/arm/mach-kirkwood/Makefile.orig b//arch/arm/mach-kirkwood/Makefile.orig +--- a//arch/arm/mach-kirkwood/Makefile.orig 1969-12-31 17:00:00.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/Makefile.orig 2010-12-18 00:39:19.589176000 -0700 +@@ -0,0 +1,20 @@ ++obj-y += common.o addr-map.o irq.o pcie.o mpp.o ++ ++obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o ++obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o ++obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o ++obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o ++obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o ++obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o ++obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o ++obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o ++obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o ++obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o ++obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o ++obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o ++obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o ++obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o ++obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o ++obj-$(CONFIG_MACH_T5325) += t5325-setup.o ++ ++obj-$(CONFIG_CPU_IDLE) += cpuidle.o +diff -urN a//arch/arm/mach-kirkwood/sheevaplug-setup.c b//arch/arm/mach-kirkwood/sheevaplug-setup.c +--- a//arch/arm/mach-kirkwood/sheevaplug-setup.c 2010-12-09 15:17:27.000000000 -0700 ++++ b//arch/arm/mach-kirkwood/sheevaplug-setup.c 2010-12-18 00:50:13.409176002 -0700 +@@ -58,7 +58,7 @@ static struct gpio_led sheevaplug_led_pins[] = { -- { + { - .name = "plug:green:health", -- .default_trigger = "default-on", -- .gpio = 49, -- .active_low = 1, -- }, -+ { -+ .name = "dockstar:green:health", -+ .default_trigger = "default-on", -+ .gpio = 46, /* green */ -+ .active_low = 1, -+ }, -+ { -+ .name = "dockstar:orange:misc", -+ .default_trigger = "none", -+ .gpio = 47, /* orange */ -+ .active_low = 1, -+ }, -+ { -+ .name = "plug:green:health", -+ .default_trigger = "default-on", -+ .gpio = 49, -+ .active_low = 1, -+ }, -+ - }; - - static struct gpio_led_platform_data sheevaplug_led_data = { -@@ -84,6 +97,8 @@ - - static unsigned int sheevaplug_mpp_config[] __initdata = { - MPP29_GPIO, /* USB Power Enable */ -+ MPP46_GPIO, /* LED green */ -+ MPP47_GPIO, /* LED orange */ - MPP49_GPIO, /* LED */ - 0 - }; ++ .name = "status:green:health", + .default_trigger = "default-on", + .gpio = 49, + .active_low = 1, +diff -urN a//arch/arm/tools/mach-types b//arch/arm/tools/mach-types +--- a//arch/arm/tools/mach-types 2010-12-09 15:17:27.000000000 -0700 ++++ b//arch/arm/tools/mach-types 2010-12-18 00:50:13.409176002 -0700 +@@ -12,7 +12,7 @@ + # + # http://www.arm.linux.org.uk/developer/machines/?action=new + # +-# Last update: Thu Sep 9 22:43:01 2010 ++# Last update: Tue Dec 14 00:41:45 2010 + # + # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number + # +@@ -1319,7 +1319,7 @@ + msm MACH_MSM MSM 1316 + ct5910 MACH_CT5910 CT5910 1317 + ct5912 MACH_CT5912 CT5912 1318 +-hynet_ine MACH_HYNET_INE HYNET_INE 1319 ++argonst_mp MACH_HYNET_INE HYNET_INE 1319 + hynet_app MACH_HYNET_APP HYNET_APP 1320 + msm7200 MACH_MSM7200 MSM7200 1321 + msm7600 MACH_MSM7600 MSM7600 1322 +@@ -1777,7 +1777,7 @@ + sg560adsl MACH_SG560ADSL SG560ADSL 1786 + nextio_n2800_ica MACH_NEXTIO_N2800_ICA NEXTIO_N2800_ICA 1787 + dove_db MACH_DOVE_DB DOVE_DB 1788 +-marvell_newdb MACH_MARVELL_NEWDB MARVELL_NEWDB 1789 ++dove_avng MACH_MARVELL_NEWDB MARVELL_NEWDB 1789 + vandihud MACH_VANDIHUD VANDIHUD 1790 + magx_e8 MACH_MAGX_E8 MAGX_E8 1791 + magx_z6 MACH_MAGX_Z6 MAGX_Z6 1792 +@@ -1877,7 +1877,7 @@ + esiblade MACH_ESIBLADE ESIBLADE 1886 + eye02 MACH_EYE02 EYE02 1887 + imx27kbd MACH_IMX27KBD IMX27KBD 1888 +-sst61vc010_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889 ++p87_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889 + kixvp435 MACH_KIXVP435 KIXVP435 1890 + kixnp435 MACH_KIXNP435 KIXNP435 1891 + africa MACH_AFRICA AFRICA 1892 +@@ -2308,7 +2308,7 @@ + tazkiosk MACH_TAZKIOSK TAZKIOSK 2320 + whiterabbit_mch MACH_WHITERABBIT_MCH WHITERABBIT_MCH 2321 + sbox9263 MACH_SBOX9263 SBOX9263 2322 +-oreo MACH_OREO OREO 2323 ++oreo_camera MACH_OREO OREO 2323 + smdk6442 MACH_SMDK6442 SMDK6442 2324 + openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325 + incredible MACH_INCREDIBLE INCREDIBLE 2326 +@@ -2321,7 +2321,7 @@ + u380 MACH_U380 U380 2333 + oamp3_hualu MACH_HUALU_BOARD HUALU_BOARD 2334 + npcmx50 MACH_NPCMX50 NPCMX50 2335 +-mx51_lange51 MACH_MX51_LANGE51 MX51_LANGE51 2336 ++mx51_efikamx MACH_MX51_EFIKAMX MX51_EFIKAMX 2336 + mx51_lange52 MACH_MX51_LANGE52 MX51_LANGE52 2337 + riom MACH_RIOM RIOM 2338 + comcas MACH_COMCAS COMCAS 2339 +@@ -2355,7 +2355,7 @@ + csb732 MACH_CSB732 CSB732 2367 + u8500 MACH_U8500 U8500 2368 + huqiu MACH_HUQIU HUQIU 2369 +-mx51_kunlun MACH_MX51_KUNLUN MX51_KUNLUN 2370 ++mx51_efikasb MACH_MX51_EFIKASB MX51_EFIKASB 2370 + pmt1g MACH_PMT1G PMT1G 2371 + htcelf MACH_HTCELF HTCELF 2372 + armadillo420 MACH_ARMADILLO420 ARMADILLO420 2373 +@@ -2374,7 +2374,7 @@ + rbl01 MACH_RBL01 RBL01 2387 + omnifi MACH_OMNIFI OMNIFI 2388 + otavalo MACH_OTAVALO OTAVALO 2389 +-sienna MACH_SIENNA SIENNA 2390 ++siena MACH_SIENNA SIENNA 2390 + htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391 + htc_opal MACH_HTC_OPAL HTC_OPAL 2392 + touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 +@@ -2446,7 +2446,7 @@ + siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 + sm3k MACH_SM3K SM3K 2460 + acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461 +-sst61vc010_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462 ++p87_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462 + glittertind MACH_GLITTERTIND GLITTERTIND 2463 + omap_zoom3 MACH_OMAP_ZOOM3 OMAP_ZOOM3 2464 + omap_3630sdp MACH_OMAP_3630SDP OMAP_3630SDP 2465 +@@ -2498,7 +2498,7 @@ + phy3250 MACH_PHY3250 PHY3250 2511 + ea3250 MACH_EA3250 EA3250 2512 + fdi3250 MACH_FDI3250 FDI3250 2513 +-whitestone MACH_WHITESTONE WHITESTONE 2514 ++htcwhitestone MACH_WHITESTONE WHITESTONE 2514 + at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515 + ccmx51 MACH_CCMX51 CCMX51 2516 + ccmx51js MACH_CCMX51JS CCMX51JS 2517 +@@ -2561,7 +2561,7 @@ + emxx MACH_EMXX EMXX 2574 + outlaw MACH_OUTLAW OUTLAW 2575 + riot_bei2 MACH_RIOT_BEI2 RIOT_BEI2 2576 +-riot_vox MACH_RIOT_VOX RIOT_VOX 2577 ++riot_gx2 MACH_RIOT_VOX RIOT_VOX 2577 + riot_x37 MACH_RIOT_X37 RIOT_X37 2578 + mega25mx MACH_MEGA25MX MEGA25MX 2579 + benzina2 MACH_BENZINA2 BENZINA2 2580 +@@ -2582,7 +2582,7 @@ + pca101 MACH_PCA101 PCA101 2595 + buzzc MACH_BUZZC BUZZC 2596 + sasie2 MACH_SASIE2 SASIE2 2597 +-davinci_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598 ++davinci_dm6467_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598 + smartmeter_dl MACH_SMARTMETER_DL SMARTMETER_DL 2599 + wzl6410 MACH_WZL6410 WZL6410 2600 + wzl6410m MACH_WZL6410M WZL6410M 2601 +@@ -2591,7 +2591,7 @@ + spacecom1 MACH_SPACECOM1 SPACECOM1 2604 + pingu920 MACH_PINGU920 PINGU920 2605 + bravoc MACH_BRAVOC BRAVOC 2606 +-cybo2440 MACH_CYBO2440 CYBO2440 2607 ++mydev MACH_CYBO2440 CYBO2440 2607 + vdssw MACH_VDSSW VDSSW 2608 + romulus MACH_ROMULUS ROMULUS 2609 + omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610 +@@ -2683,7 +2683,7 @@ + mw6410 MACH_MW6410 MW6410 2696 + terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697 + cpu8000e MACH_CPU8000E CPU8000E 2698 +-catania MACH_CATANIA CATANIA 2699 ++catania_s MACH_CATANIA CATANIA 2699 + tokyo MACH_TOKYO TOKYO 2700 + msm7201a_surf MACH_MSM7201A_SURF MSM7201A_SURF 2701 + msm7201a_ffa MACH_MSM7201A_FFA MSM7201A_FFA 2702 +@@ -2750,7 +2750,7 @@ + smint01 MACH_SMINT01 SMINT01 2763 + prtlvt2 MACH_PRTLVT2 PRTLVT2 2764 + ap420 MACH_AP420 AP420 2765 +-htcshift MACH_HTCSHIFT HTCSHIFT 2766 ++htcclio MACH_HTCSHIFT HTCSHIFT 2766 + davinci_dm365_fc MACH_DAVINCI_DM365_FC DAVINCI_DM365_FC 2767 + msm8x55_surf MACH_MSM8X55_SURF MSM8X55_SURF 2768 + msm8x55_ffa MACH_MSM8X55_FFA MSM8X55_FFA 2769 +@@ -2761,7 +2761,7 @@ + kopin_models MACH_KOPIN_MODELS KOPIN_MODELS 2774 + ttc_vision2 MACH_TTC_VISION2 TTC_VISION2 2775 + cns3420vb MACH_CNS3420VB CNS3420VB 2776 +-lpc2 MACH_LPC2 LPC2 2777 ++lpc_evo MACH_LPC2 LPC2 2777 + olympus MACH_OLYMPUS OLYMPUS 2778 + vortex MACH_VORTEX VORTEX 2779 + s5pc200 MACH_S5PC200 S5PC200 2780 +@@ -2788,7 +2788,7 @@ + neocoreomap MACH_NEOCOREOMAP NEOCOREOMAP 2801 + withings_wbp MACH_WITHINGS_WBP WITHINGS_WBP 2802 + dbps MACH_DBPS DBPS 2803 +-sbc9261 MACH_SBC9261 SBC9261 2804 ++at91sam9261 MACH_SBC9261 SBC9261 2804 + pcbfp0001 MACH_PCBFP0001 PCBFP0001 2805 + speedy MACH_SPEEDY SPEEDY 2806 + chrysaor MACH_CHRYSAOR CHRYSAOR 2807 +@@ -2812,7 +2812,7 @@ + acer_a4 MACH_ACER_A4 ACER_A4 2825 + davinci_dm368_bip MACH_DAVINCI_DM368_BIP DAVINCI_DM368_BIP 2826 + eshare MACH_ESHARE ESHARE 2827 +-hw_omapl138_europa MACH_HW_OMAPL138_EUROPA HW_OMAPL138_EUROPA 2828 ++omapl138_europa MACH_HW_OMAPL138_EUROPA HW_OMAPL138_EUROPA 2828 + wlbargn MACH_WLBARGN WLBARGN 2829 + bm170 MACH_BM170 BM170 2830 + netspace_mini_v2 MACH_NETSPACE_MINI_V2 NETSPACE_MINI_V2 2831 +@@ -2879,7 +2879,7 @@ + mecha MACH_MECHA MECHA 2892 + bubba3 MACH_BUBBA3 BUBBA3 2893 + pupitre MACH_PUPITRE PUPITRE 2894 +-tegra_harmony MACH_TEGRA_HARMONY TEGRA_HARMONY 2895 ++tegra_unused MACH_TEGRA_HARMONY TEGRA_HARMONY 2895 + tegra_vogue MACH_TEGRA_VOGUE TEGRA_VOGUE 2896 + tegra_e1165 MACH_TEGRA_E1165 TEGRA_E1165 2897 + simplenet MACH_SIMPLENET SIMPLENET 2898 +@@ -2896,6 +2896,7 @@ + app3k_robin MACH_APP3K_ROBIN APP3K_ROBIN 2909 + pov15hd MACH_POV15HD POV15HD 2910 + stella MACH_STELLA STELLA 2911 ++htc_iolite MACH_MACH_HTC_IOLITE MACH_HTC_IOLITE 2912 + linkstation_lschl MACH_LINKSTATION_LSCHL LINKSTATION_LSCHL 2913 + netwalker MACH_NETWALKER NETWALKER 2914 + acsx106 MACH_ACSX106 ACSX106 2915 +@@ -2959,6 +2960,7 @@ + pc9260_v2 MACH_PC9260_V2 PC9260_V2 2973 + ptx7545 MACH_PTX7545 PTX7545 2974 + tm_efdc MACH_TM_EFDC TM_EFDC 2975 ++remove_me MACH_WALDO1 WALDO1 2976 + omap3_waldo1 MACH_OMAP3_WALDO1 OMAP3_WALDO1 2977 + flyer MACH_FLYER FLYER 2978 + tornado3240 MACH_TORNADO3240 TORNADO3240 2979 +@@ -2969,9 +2971,9 @@ + ssc MACH_SSC SSC 2984 + premierwave_en MACH_PREMIERWAVE_EN PREMIERWAVE_EN 2985 + wasabi MACH_WASABI WASABI 2986 +-vivow MACH_VIVOW VIVOW 2987 ++vivo_w MACH_VIVOW VIVOW 2987 + mx50_rdp MACH_MX50_RDP MX50_RDP 2988 +-universal MACH_UNIVERSAL UNIVERSAL 2989 ++universal_c210 MACH_UNIVERSAL_C210 UNIVERSAL_C210 2989 + real6410 MACH_REAL6410 REAL6410 2990 + spx_sakura MACH_SPX_SAKURA SPX_SAKURA 2991 + ij3k_2440 MACH_IJ3K_2440 IJ3K_2440 2992 +@@ -2987,7 +2989,7 @@ + ea20 MACH_EA20 EA20 3002 + awm2 MACH_AWM2 AWM2 3003 + ti8148evm MACH_TI8148EVM TI8148EVM 3004 +-tegra_seaboard MACH_TEGRA_SEABOARD TEGRA_SEABOARD 3005 ++seaboard MACH_SEABOARD SEABOARD 3005 + linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006 + tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007 + rubys MACH_RUBYS RUBYS 3008 +@@ -3017,12 +3019,12 @@ + at91cap7xdk MACH_AT91CAP7XDK AT91CAP7XDK 3032 + at91cap7stk MACH_AT91CAP7STK AT91CAP7STK 3033 + kt_sbc_sam9_1 MACH_KT_SBC_SAM9_1 KT_SBC_SAM9_1 3034 +-oratisrouter MACH_ORATISROUTER ORATISROUTER 3035 ++at91sam9263router MACH_ORATISROUTER ORATISROUTER 3035 + armada_xp_db MACH_ARMADA_XP_DB ARMADA_XP_DB 3036 + spdm MACH_SPDM SPDM 3037 + gtib MACH_GTIB GTIB 3038 + dgm3240 MACH_DGM3240 DGM3240 3039 +-atlas_i_lpe MACH_ATLAS_I_LPE ATLAS_I_LPE 3040 ++iv_atlas_i_lpe MACH_ATLAS_I_LPE ATLAS_I_LPE 3040 + htcmega MACH_HTCMEGA HTCMEGA 3041 + tricorder MACH_TRICORDER TRICORDER 3042 + tx28 MACH_TX28 TX28 3043 +@@ -3038,9 +3040,188 @@ + controltek9g20 MACH_CONTROLTEK9G20 CONTROLTEK9G20 3053 + tin307 MACH_TIN307 TIN307 3054 + tin510 MACH_TIN510 TIN510 3055 ++ep3505 MACH_EP3517 EP3517 3056 + bluecheese MACH_BLUECHEESE BLUECHEESE 3057 + tem3x30 MACH_TEM3X30 TEM3X30 3058 + harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059 + msm8x60_qrdc MACH_MSM8X60_QRDC MSM8X60_QRDC 3060 + spear900 MACH_SPEAR900 SPEAR900 3061 + pcontrol_g20 MACH_PCONTROL_G20 PCONTROL_G20 3062 ++rdstor MACH_RDSTOR RDSTOR 3063 ++usdloader MACH_USDLOADER USDLOADER 3064 ++tsoploader MACH_TSOPLOADER TSOPLOADER 3065 ++kronos MACH_KRONOS KRONOS 3066 ++ffcore MACH_FFCORE FFCORE 3067 ++mone MACH_MONE MONE 3068 ++unit2s MACH_UNIT2S UNIT2S 3069 ++acer_a5 MACH_ACER_A5 ACER_A5 3070 ++etherpro_isp MACH_ETHERPRO_ISP ETHERPRO_ISP 3071 ++stretchs7000 MACH_STRETCHS7000 STRETCHS7000 3072 ++p87_smartsim MACH_P87_SMARTSIM P87_SMARTSIM 3073 ++tulip MACH_TULIP TULIP 3074 ++sunflower MACH_SUNFLOWER SUNFLOWER 3075 ++rib MACH_RIB RIB 3076 ++clod MACH_CLOD CLOD 3077 ++rump MACH_RUMP RUMP 3078 ++tenderloin MACH_TENDERLOIN TENDERLOIN 3079 ++shortloin MACH_SHORTLOIN SHORTLOIN 3080 ++roml1 MACH_CRESPO CRESPO 3081 ++antares MACH_ANTARES ANTARES 3082 ++wb40n MACH_WB40N WB40N 3083 ++herring MACH_HERRING HERRING 3084 ++naxy400 MACH_NAXY400 NAXY400 3085 ++naxy1200 MACH_NAXY1200 NAXY1200 3086 ++vpr200 MACH_VPR200 VPR200 3087 ++bug20 MACH_BUG20 BUG20 3088 ++goflexnet MACH_GOFLEXNET GOFLEXNET 3089 ++torbreck MACH_TORBRECK TORBRECK 3090 ++saarb_mg1 MACH_SAARB_MG1 SAARB_MG1 3091 ++callisto MACH_CALLISTO CALLISTO 3092 ++multhsu MACH_MULTHSU MULTHSU 3093 ++saluda MACH_SALUDA SALUDA 3094 ++pemp_omap3_apollo MACH_PEMP_OMAP3_APOLLO PEMP_OMAP3_APOLLO 3095 ++vc0718 MACH_VC0718 VC0718 3096 ++mvblx MACH_MVBLX MVBLX 3097 ++inhand_apeiron MACH_INHAND_APEIRON INHAND_APEIRON 3098 ++inhand_fury MACH_INHAND_FURY INHAND_FURY 3099 ++inhand_siren MACH_INHAND_SIREN INHAND_SIREN 3100 ++hdnvp MACH_HDNVP HDNVP 3101 ++softwinner MACH_SOFTWINNER SOFTWINNER 3102 ++prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 ++nas6210 MACH_NAS6210 NAS6210 3104 ++unisdev MACH_UNISDEV UNISDEV 3105 ++sbca11 MACH_SBCA11 SBCA11 3106 ++saga MACH_SAGA SAGA 3107 ++ns_k330 MACH_NS_K330 NS_K330 3108 ++tanna MACH_TANNA TANNA 3109 ++imate8502 MACH_IMATE8502 IMATE8502 3110 ++aspen MACH_ASPEN ASPEN 3111 ++daintree_cwac MACH_DAINTREE_CWAC DAINTREE_CWAC 3112 ++zmx25 MACH_ZMX25 ZMX25 3113 ++maple1 MACH_MAPLE1 MAPLE1 3114 ++qsd8x72_surf MACH_QSD8X72_SURF QSD8X72_SURF 3115 ++qsd8x72_ffa MACH_QSD8X72_FFA QSD8X72_FFA 3116 ++abilene MACH_ABILENE ABILENE 3117 ++eigen_ttr MACH_EIGEN_TTR EIGEN_TTR 3118 ++iomega_ix2_200 MACH_IOMEGA_IX2_200 IOMEGA_IX2_200 3119 ++coretec_vcx7400 MACH_CORETEC_VCX7400 CORETEC_VCX7400 3120 ++santiago MACH_SANTIAGO SANTIAGO 3121 ++mx257sol MACH_MX257SOL MX257SOL 3122 ++strasbourg MACH_STRASBOURG STRASBOURG 3123 ++msm8x60_fluid MACH_MSM8X60_FLUID MSM8X60_FLUID 3124 ++smartqv5 MACH_SMARTQV5 SMARTQV5 3125 ++smartqv3 MACH_SMARTQV3 SMARTQV3 3126 ++smartqv7 MACH_SMARTQV7 SMARTQV7 3127 ++tegra_paz00 MACH_PAZ00 PAZ00 3128 ++acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129 ++htc_willow MACH_HTCWILLOW HTCWILLOW 3130 ++fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131 ++hdgu MACH_HDGU HDGU 3132 ++pyramid MACH_PYRAMID PYRAMID 3133 ++epiphan MACH_EPIPHAN EPIPHAN 3134 ++omap_bender MACH_OMAP_BENDER OMAP_BENDER 3135 ++gurnard MACH_GURNARD GURNARD 3136 ++gtl_it5100 MACH_GTL_IT5100 GTL_IT5100 3137 ++bcm2708 MACH_BCM2708 BCM2708 3138 ++mx51_ggc MACH_MX51_GGC MX51_GGC 3139 ++sharespace MACH_SHARESPACE SHARESPACE 3140 ++haba_knx_explorer MACH_HABA_KNX_EXPLORER HABA_KNX_EXPLORER 3141 ++simtec_kirkmod MACH_SIMTEC_KIRKMOD SIMTEC_KIRKMOD 3142 ++crux MACH_CRUX CRUX 3143 ++mx51_bravo MACH_MX51_BRAVO MX51_BRAVO 3144 ++charon MACH_CHARON CHARON 3145 ++picocom3 MACH_PICOCOM3 PICOCOM3 3146 ++picocom4 MACH_PICOCOM4 PICOCOM4 3147 ++serrano MACH_SERRANO SERRANO 3148 ++doubleshot MACH_DOUBLESHOT DOUBLESHOT 3149 ++evsy MACH_EVSY EVSY 3150 ++huashan MACH_HUASHAN HUASHAN 3151 ++lausanne MACH_LAUSANNE LAUSANNE 3152 ++emerald MACH_EMERALD EMERALD 3153 ++tqma35 MACH_TQMA35 TQMA35 3154 ++marvel MACH_MARVEL MARVEL 3155 ++manuae MACH_MANUAE MANUAE 3156 ++chacha MACH_CHACHA CHACHA 3157 ++lemon MACH_LEMON LEMON 3158 ++csc MACH_CSC CSC 3159 ++gira_knxip_router MACH_GIRA_KNXIP_ROUTER GIRA_KNXIP_ROUTER 3160 ++t20 MACH_T20 T20 3161 ++hdmini MACH_HDMINI HDMINI 3162 ++sciphone_g2 MACH_SCIPHONE_G2 SCIPHONE_G2 3163 ++express MACH_EXPRESS EXPRESS 3164 ++express_kt MACH_EXPRESS_KT EXPRESS_KT 3165 ++maximasp MACH_MAXIMASP MAXIMASP 3166 ++nitrogen_imx51 MACH_NITROGEN_IMX51 NITROGEN_IMX51 3167 ++nitrogen_imx53 MACH_NITROGEN_IMX53 NITROGEN_IMX53 3168 ++sunfire MACH_SUNFIRE SUNFIRE 3169 ++arowana MACH_AROWANA AROWANA 3170 ++tegra_daytona MACH_TEGRA_DAYTONA TEGRA_DAYTONA 3171 ++tegra_swordfish MACH_TEGRA_SWORDFISH TEGRA_SWORDFISH 3172 ++edison MACH_EDISON EDISON 3173 ++svp8500v1 MACH_SVP8500V1 SVP8500V1 3174 ++svp8500v2 MACH_SVP8500V2 SVP8500V2 3175 ++svp5500 MACH_SVP5500 SVP5500 3176 ++b5500 MACH_B5500 B5500 3177 ++s5500 MACH_S5500 S5500 3178 ++icon MACH_ICON ICON 3179 ++elephant MACH_ELEPHANT ELEPHANT 3180 ++msm8x60_charm_surf MACH_MSM8X60_FUSION MSM8X60_FUSION 3181 ++shooter MACH_SHOOTER SHOOTER 3182 ++spade_lte MACH_SPADE_LTE SPADE_LTE 3183 ++philhwani MACH_PHILHWANI PHILHWANI 3184 ++gsncomm MACH_GSNCOMM GSNCOMM 3185 ++strasbourg_a2 MACH_STRASBOURG_A2 STRASBOURG_A2 3186 ++mmm MACH_MMM MMM 3187 ++davinci_dm365_bv MACH_DAVINCI_DM365_BV DAVINCI_DM365_BV 3188 ++ag5evm MACH_AG5EVM AG5EVM 3189 ++sc575plc MACH_SC575PLC SC575PLC 3190 ++sc575hmi MACH_SC575IPC SC575IPC 3191 ++omap3_tdm3730 MACH_OMAP3_TDM3730 OMAP3_TDM3730 3192 ++rover_g7 MACH_G7 G7 3193 ++top9000_eval MACH_TOP9000_EVAL TOP9000_EVAL 3194 ++top9000_su MACH_TOP9000_SU TOP9000_SU 3195 ++utm300 MACH_UTM300 UTM300 3196 ++tsunagi MACH_TSUNAGI TSUNAGI 3197 ++ts75xx MACH_TS75XX TS75XX 3198 ++msm8x60_charm_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199 ++ts47xx MACH_TS47XX TS47XX 3200 ++da850_k5 MACH_DA850_K5 DA850_K5 3201 ++ax502 MACH_AX502 AX502 3202 ++igep0032 MACH_IGEP0032 IGEP0032 3203 ++antero MACH_ANTERO ANTERO 3204 ++synergy MACH_SYNERGY SYNERGY 3205 ++ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 ++wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 ++punica MACH_PUNICA PUNICA 3208 ++sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209 ++mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210 ++mackerel MACH_MACKEREL MACKEREL 3211 ++pvd_imx27 MACH_MACH_PVD_IMX27 MACH_PVD_IMX27 3212 ++fa9x27 MACH_FA9X27 FA9X27 3213 ++ns2816tb MACH_NS2816TB NS2816TB 3214 ++ns2816_ntpad MACH_NS2816_NTPAD NS2816_NTPAD 3215 ++ns2816_ntnb MACH_NS2816_NTNB NS2816_NTNB 3216 ++kaen MACH_KAEN KAEN 3217 ++nv1000 MACH_NV1000 NV1000 3218 ++nuc950ts MACH_NUC950TS NUC950TS 3219 ++nokia_rm680 MACH_NOKIA_RM680 NOKIA_RM680 3220 ++ast2200 MACH_AST2200 AST2200 3221 ++lead MACH_LEAD LEAD 3222 ++unino1 MACH_UNINO1 UNINO1 3223 ++greeco MACH_GREECO GREECO 3224 ++verdi MACH_VERDI VERDI 3225 ++dm6446_adbox MACH_DM6446_ADBOX DM6446_ADBOX 3226 ++quad_salsa MACH_QUAD_SALSA QUAD_SALSA 3227 ++abb_gma_1_1 MACH_ABB_GMA_1_1 ABB_GMA_1_1 3228 ++svcid MACH_SVCID SVCID 3229 ++msm8960_sim MACH_MSM8960_SIM MSM8960_SIM 3230 ++msm8960_rumi3 MACH_MSM8960_RUMI3 MSM8960_RUMI3 3231 ++icon_g MACH_ICON_G ICON_G 3232 ++mb3 MACH_MB3 MB3 3233 ++gsia18s MACH_GSIA18S GSIA18S 3234 ++pivicc MACH_PIVICC PIVICC 3235 ++pcm048 MACH_PCM048 PCM048 3236 ++dds MACH_DDS DDS 3237 ++chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238 ++ts48xx MACH_TS48XX TS48XX 3239 ++tonga2_tfttimer MACH_TONGA2_TFTTIMER TONGA2_TFTTIMER 3240 diff --git a/core/kernel26/PKGBUILD b/core/kernel26/PKGBUILD index a5c213f0e..9d7abfb06 100644 --- a/core/kernel26/PKGBUILD +++ b/core/kernel26/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26' 'kernel26-headers') _kernelname=${pkgname#kernel26} _basekernel=2.6.36 pkgver=${_basekernel}.2 -pkgrel=2 +pkgrel=1 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make') _patchname="patch-${pkgver}-${pkgrel}-ARCH" replaces=('kernel26-withlinux' 'kernel26-dockstar') @@ -19,14 +19,12 @@ url="http://www.kernel.org" source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2 2.6.36.2.config - 0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch LEDs.patch kernel26.preset) md5sums=('61f3739a73afb6914cb007f37fb09b62' '998b597b8659f1ac2667bbc13d1905b8' '1d3b6a3141c87273b8ce4517ffe24935' - '0ed85186b0b5446c4afbbc45639a7466' - '2bf7b876a0c4889ee62e0dd3f6089636' + 'd9577edccb065042a7851a44ea4866c0' '25584700a0a679542929c4bed31433b6') build() { @@ -36,9 +34,8 @@ build() { # See http://projects.archlinux.org/linux-2.6-ARCH.git/ patch -Np1 -i ${srcdir}/${_patchname} - # Apply Aholler's DockStar hardware patches - patch -Np1 -i ${srcdir}/0001-MTD-partitons-used-by-the-Seagate-FreeAgent-DockStar.patch - patch -Np1 -i ${srcdir}/0002-LED-definitions-for-the-Seagate-FreeAgent-DockStar.patch + # Apply the LED patches + patch -Np1 -i ${srcdir}/LEDs.patch cat ../2.6.36.2.config >./.config