From cece0135ff975cd841ef63a8cf4bf17ff7b15860 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Mar 2009 17:07:11 +0100 Subject: linux-davinci git: update leopard patch since he have an offical machine ID now :) * uboot still needs to get fixed, though --- ...ard-add-board-file-based-on-board-dm355-e.patch | 6 +- .../linux/linux-davinci/dm355-leopard/defconfig | 2 +- .../linux/linux-davinci/update-mach-types.patch | 160 +++++++++++++++++++++ packages/linux/linux-davinci_git.bb | 2 + 4 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 packages/linux/linux-davinci/update-mach-types.patch diff --git a/packages/linux/linux-davinci/dm355-leopard/0001-dm355-leopard-add-board-file-based-on-board-dm355-e.patch b/packages/linux/linux-davinci/dm355-leopard/0001-dm355-leopard-add-board-file-based-on-board-dm355-e.patch index eaa2496e89..746a64fe44 100644 --- a/packages/linux/linux-davinci/dm355-leopard/0001-dm355-leopard-add-board-file-based-on-board-dm355-e.patch +++ b/packages/linux/linux-davinci/dm355-leopard/0001-dm355-leopard-add-board-file-based-on-board-dm355-e.patch @@ -18,7 +18,7 @@ index 0010f2d..85424b8 100644 Say Y here to select the Lyrtech Small Form Factor Software Defined Radio (SFFSDR) board. -+config MACH_DAVINCI_DM355_LEOPARD ++config MACH_DM355_LEOPARD + bool "TI DM355 Leopard board" + default n + depends on ARCH_DAVINCI_DM355 @@ -37,7 +37,7 @@ index 6783681..96ef484 100644 obj-$(CONFIG_MACH_DAVINCI_DM646X_EVM) += board-dm646x-evm.o obj-$(CONFIG_MACH_DAVINCI_DM355_EVM) += board-dm355-evm.o obj-$(CONFIG_MACH_SFFSDR) += board-sffsdr.o -+obj-$(CONFIG_MACH_DAVINCI_DM355_LEOPARD) += board-dm355-leopard.o ++obj-$(CONFIG_MACH_DM355_LEOPARD) += board-dm355-leopard.o + diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c new file mode 100644 @@ -331,7 +331,7 @@ index 0000000..a1e97e8 + davinci_irq_init(); +} + -+MACHINE_START(DAVINCI_DM355_leopard, "DaVinci DM355 leopard") ++MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") + .phys_io = IO_PHYS, + .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, + .boot_params = (0x80000100), diff --git a/packages/linux/linux-davinci/dm355-leopard/defconfig b/packages/linux/linux-davinci/dm355-leopard/defconfig index 8a416747e8..cfa3ab746c 100644 --- a/packages/linux/linux-davinci/dm355-leopard/defconfig +++ b/packages/linux/linux-davinci/dm355-leopard/defconfig @@ -185,7 +185,7 @@ CONFIG_ARCH_DAVINCI_DM355=y # DaVinci Board Type # # CONFIG_MACH_DAVINCI_DM355_EVM is not set -CONFIG_MACH_DAVINCI_DM355_LEOPARD=y +CONFIG_MACH_DM355_LEOPARD=y CONFIG_DAVINCI_MUX=y # CONFIG_DAVINCI_MUX_DEBUG is not set # CONFIG_DAVINCI_MUX_WARNINGS is not set diff --git a/packages/linux/linux-davinci/update-mach-types.patch b/packages/linux/linux-davinci/update-mach-types.patch new file mode 100644 index 0000000000..f72836bf41 --- /dev/null +++ b/packages/linux/linux-davinci/update-mach-types.patch @@ -0,0 +1,160 @@ +--- /tmp/mach-types 2009-03-17 16:55:42.000000000 +0100 ++++ git/arch/arm/tools/mach-types 2009-03-17 16:56:28.000000000 +0100 +@@ -12,7 +12,7 @@ + # + # http://www.arm.linux.org.uk/developer/machines/?action=new + # +-# Last update: Sun Nov 30 16:39:36 2008 ++# Last update: Tue Mar 17 15:56:28 2009 + # + # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number + # +@@ -1811,7 +1811,7 @@ + jade MACH_JADE JADE 1821 + ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 + gprisc3 MACH_GPRISC3 GPRISC3 1823 +-stamp9260 MACH_STAMP9260 STAMP9260 1824 ++stamp9g20 MACH_STAMP9G20 STAMP9G20 1824 + smdk6430 MACH_SMDK6430 SMDK6430 1825 + smdkc100 MACH_SMDKC100 SMDKC100 1826 + tavorevb MACH_TAVOREVB TAVOREVB 1827 +@@ -1993,4 +1993,138 @@ + benzina MACH_BENZINA BENZINA 2003 + blaze MACH_BLAZE BLAZE 2004 + linkstation_ls_hgl MACH_LINKSTATION_LS_HGL LINKSTATION_LS_HGL 2005 +-htcvenus MACH_HTCVENUS HTCVENUS 2006 ++htckovsky MACH_HTCVENUS HTCVENUS 2006 ++sony_prs505 MACH_SONY_PRS505 SONY_PRS505 2007 ++hanlin_v3 MACH_HANLIN_V3 HANLIN_V3 2008 ++sapphira MACH_SAPPHIRA SAPPHIRA 2009 ++dack_sda_01 MACH_DACK_SDA_01 DACK_SDA_01 2010 ++armbox MACH_ARMBOX ARMBOX 2011 ++harris_rvp MACH_HARRIS_RVP HARRIS_RVP 2012 ++ribaldo MACH_RIBALDO RIBALDO 2013 ++agora MACH_AGORA AGORA 2014 ++omap3_mini MACH_OMAP3_MINI OMAP3_MINI 2015 ++a9sam6432_b MACH_A9SAM6432_B A9SAM6432_B 2016 ++usg2410 MACH_USG2410 USG2410 2017 ++pc72052_i10_revb MACH_PC72052_I10_REVB PC72052_I10_REVB 2018 ++mx35_exm32 MACH_MX35_EXM32 MX35_EXM32 2019 ++topas910 MACH_TOPAS910 TOPAS910 2020 ++hyena MACH_HYENA HYENA 2021 ++pospax MACH_POSPAX POSPAX 2022 ++hdl_gx MACH_HDL_GX HDL_GX 2023 ++ctera_4bay MACH_CTERA_4BAY CTERA_4BAY 2024 ++ctera_plug_c MACH_CTERA_PLUG_C CTERA_PLUG_C 2025 ++crwea_plug_i MACH_CRWEA_PLUG_I CRWEA_PLUG_I 2026 ++egauge2 MACH_EGAUGE2 EGAUGE2 2027 ++didj MACH_DIDJ DIDJ 2028 ++m_s3c2443 MACH_MEISTER MEISTER 2029 ++htcblackstone MACH_HTCBLACKSTONE HTCBLACKSTONE 2030 ++cpuat9g20 MACH_CPUAT9G20 CPUAT9G20 2031 ++smdk6440 MACH_SMDK6440 SMDK6440 2032 ++omap_35xx_mvp MACH_OMAP_35XX_MVP OMAP_35XX_MVP 2033 ++ctera_plug_i MACH_CTERA_PLUG_I CTERA_PLUG_I 2034 ++pvg610_100 MACH_PVG610 PVG610 2035 ++hprw6815 MACH_HPRW6815 HPRW6815 2036 ++omap3_oswald MACH_OMAP3_OSWALD OMAP3_OSWALD 2037 ++nas4220b MACH_NAS4220B NAS4220B 2038 ++htcraphael_cdma MACH_HTCRAPHAEL_CDMA HTCRAPHAEL_CDMA 2039 ++htcdiamond_cdma MACH_HTCDIAMOND_CDMA HTCDIAMOND_CDMA 2040 ++scaler MACH_SCALER SCALER 2041 ++zylonite2 MACH_ZYLONITE2 ZYLONITE2 2042 ++aspenite MACH_ASPENITE ASPENITE 2043 ++teton MACH_TETON TETON 2044 ++ttc_dkb MACH_TTC_DKB TTC_DKB 2045 ++bishop2 MACH_BISHOP2 BISHOP2 2046 ++ippv5 MACH_IPPV5 IPPV5 2047 ++farm926 MACH_FARM926 FARM926 2048 ++mmccpu MACH_MMCCPU MMCCPU 2049 ++sgmsfl MACH_SGMSFL SGMSFL 2050 ++tt8000 MACH_TT8000 TT8000 2051 ++zrn4300lp MACH_ZRN4300LP ZRN4300LP 2052 ++mptc MACH_MPTC MPTC 2053 ++h6051 MACH_H6051 H6051 2054 ++pvg610_101 MACH_PVG610_101 PVG610_101 2055 ++stamp9261_pc_evb MACH_STAMP9261_PC_EVB STAMP9261_PC_EVB 2056 ++pelco_odysseus MACH_PELCO_ODYSSEUS PELCO_ODYSSEUS 2057 ++tny_a9260 MACH_TNY_A9260 TNY_A9260 2058 ++tny_a9g20 MACH_TNY_A9G20 TNY_A9G20 2059 ++aesop_mp2530f MACH_AESOP_MP2530F AESOP_MP2530F 2060 ++dx900 MACH_DX900 DX900 2061 ++cpodc2 MACH_CPODC2 CPODC2 2062 ++tilt_8925 MACH_TILT_8925 TILT_8925 2063 ++davinci_dm357_evm MACH_DAVINCI_DM357_EVM DAVINCI_DM357_EVM 2064 ++swordfish MACH_SWORDFISH SWORDFISH 2065 ++corvus MACH_CORVUS CORVUS 2066 ++taurus MACH_TAURUS TAURUS 2067 ++axm MACH_AXM AXM 2068 ++axc MACH_AXC AXC 2069 ++baby MACH_BABY BABY 2070 ++mp200 MACH_MP200 MP200 2071 ++pcm043 MACH_PCM043 PCM043 2072 ++hanlin_v3c MACH_HANLIN_V3C HANLIN_V3C 2073 ++kbk9g20 MACH_KBK9G20 KBK9G20 2074 ++adsturbog5 MACH_ADSTURBOG5 ADSTURBOG5 2075 ++avenger_lite1 MACH_AVENGER_LITE1 AVENGER_LITE1 2076 ++suc82x MACH_SUC SUC 2077 ++at91sam7s256 MACH_AT91SAM7S256 AT91SAM7S256 2078 ++mendoza MACH_MENDOZA MENDOZA 2079 ++kira MACH_KIRA KIRA 2080 ++mx1hbm MACH_MX1HBM MX1HBM 2081 ++quatro43xx MACH_QUATRO43XX QUATRO43XX 2082 ++quatro4230 MACH_QUATRO4230 QUATRO4230 2083 ++nsb400 MACH_NSB400 NSB400 2084 ++drp255 MACH_DRP255 DRP255 2085 ++thoth MACH_THOTH THOTH 2086 ++firestone MACH_FIRESTONE FIRESTONE 2087 ++asusp750 MACH_ASUSP750 ASUSP750 2088 ++ctera_dl MACH_CTERA_DL CTERA_DL 2089 ++socr MACH_SOCR SOCR 2090 ++htcoxygen MACH_HTCOXYGEN HTCOXYGEN 2091 ++heroc MACH_HEROC HEROC 2092 ++zeno6800 MACH_ZENO6800 ZENO6800 2093 ++sc2mcs MACH_SC2MCS SC2MCS 2094 ++gene100 MACH_GENE100 GENE100 2095 ++as353x MACH_AS353X AS353X 2096 ++sheevaplug MACH_SHEEVAPLUG SHEEVAPLUG 2097 ++at91sam9g20 MACH_AT91SAM9G20 AT91SAM9G20 2098 ++mv88f6192gtw_fe MACH_MV88F6192GTW_FE MV88F6192GTW_FE 2099 ++cc9200 MACH_CC9200 CC9200 2100 ++sm9200 MACH_SM9200 SM9200 2101 ++tp9200 MACH_TP9200 TP9200 2102 ++snapperdv MACH_SNAPPERDV SNAPPERDV 2103 ++avengers_lite MACH_AVENGERS_LITE AVENGERS_LITE 2104 ++avengers_lite1 MACH_AVENGERS_LITE1 AVENGERS_LITE1 2105 ++omap3axon MACH_OMAP3AXON OMAP3AXON 2106 ++ma8xx MACH_MA8XX MA8XX 2107 ++mp201ek MACH_MP201EK MP201EK 2108 ++davinci_tux MACH_DAVINCI_TUX DAVINCI_TUX 2109 ++mpa1600 MACH_MPA1600 MPA1600 2110 ++pelco_troy MACH_PELCO_TROY PELCO_TROY 2111 ++nsb667 MACH_NSB667 NSB667 2112 ++rovers5_4mpix MACH_ROVERS5_4MPIX ROVERS5_4MPIX 2113 ++twocom MACH_TWOCOM TWOCOM 2114 ++ubisys_p9_rcu3r2 MACH_UBISYS_P9_RCU3R2 UBISYS_P9_RCU3R2 2115 ++hero_espresso MACH_HERO_ESPRESSO HERO_ESPRESSO 2116 ++afeusb MACH_AFEUSB AFEUSB 2117 ++t830 MACH_T830 T830 2118 ++spd8020_cc MACH_SPD8020_CC SPD8020_CC 2119 ++om_3d7k MACH_OM_3D7K OM_3D7K 2120 ++picocom2 MACH_PICOCOM2 PICOCOM2 2121 ++uwg4mx27 MACH_UWG4MX27 UWG4MX27 2122 ++uwg4mx31 MACH_UWG4MX31 UWG4MX31 2123 ++cherry MACH_CHERRY CHERRY 2124 ++mx51_babbage MACH_MX51_BABBAGE MX51_BABBAGE 2125 ++s3c2440turkiye MACH_S3C2440TURKIYE S3C2440TURKIYE 2126 ++tx37 MACH_TX37 TX37 2127 ++sbc2800_9g20 MACH_SBC2800_9G20 SBC2800_9G20 2128 ++benzglb MACH_BENZGLB BENZGLB 2129 ++benztd MACH_BENZTD BENZTD 2130 ++cartesio_plus MACH_CARTESIO_PLUS CARTESIO_PLUS 2131 ++solrad_g20 MACH_SOLRAD_G20 SOLRAD_G20 2132 ++mx27wallace MACH_MX27WALLACE MX27WALLACE 2133 ++fmzwebmodul MACH_FMZWEBMODUL FMZWEBMODUL 2134 ++rd78x00_masa MACH_RD78X00_MASA RD78X00_MASA 2135 ++smallogger MACH_SMALLOGGER SMALLOGGER 2136 ++ccw9p9215 MACH_CCW9P9215 CCW9P9215 2137 ++dm355_leopard MACH_DM355_LEOPARD DM355_LEOPARD 2138 ++ts219 MACH_TS219 TS219 2139 ++tny_a9263 MACH_TNY_A9263 TNY_A9263 2140 diff --git a/packages/linux/linux-davinci_git.bb b/packages/linux/linux-davinci_git.bb index a04527904e..3d88995f6f 100644 --- a/packages/linux/linux-davinci_git.bb +++ b/packages/linux/linux-davinci_git.bb @@ -10,8 +10,10 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "486afa37130356662213cc1a2199a285b4fd72af" PV = "2.6.29+2.6.29-rc7-${PR}+gitr${SRCREV}" +PR = "r1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ + file://update-mach-types.patch;patch=1 \ file://defconfig" SRC_URI_append_davinci-sffsdr = " \ -- cgit v1.2.3