From subversion@balloonboard.org Thu Mar 11 18:44:41 2010 Received: from wookey by stoneboat.aleph1.co.uk with local (Exim 4.69) (envelope-from ) id 1NpnNB-0007S7-OM for balloon-svn@balloonboard.org; Thu, 11 Mar 2010 18:44:41 +0000 Date: Thu, 11 Mar 2010 18:44:41 +0000 To: balloon-svn@balloonboard.org From: subversion@balloonboard.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: subversion@balloonboard.org X-SA-Exim-Scanned: No (on stoneboat.aleph1.co.uk); SAEximRunCond expanded to false Subject: [Balloon-svn] r1022 - in balloon: branches/novlio/bootldr branches/novlio-ncs1/bootldr trunk/bootldr X-BeenThere: balloon-svn@balloonboard.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2010 18:44:41 -0000 Author: wookey Date: 2010-03-11 18:44:41 +0000 (Thu, 11 Mar 2010) New Revision: 1022 Modified: balloon/branches/novlio-ncs1/bootldr/Makefile-level2 balloon/branches/novlio-ncs1/bootldr/btflash.c balloon/branches/novlio/bootldr/Makefile-level2 balloon/trunk/bootldr/Makefile-level2 balloon/trunk/bootldr/btflash.c Log: Merge support for M29W640G NOR flash into trunk and novlio-ncs1 Bump version-minor to .2 in all 3 active branches Modified: balloon/branches/novlio/bootldr/Makefile-level2 =================================================================== --- balloon/branches/novlio/bootldr/Makefile-level2 2010-03-11 18:26:47 UTC (rev 1021) +++ balloon/branches/novlio/bootldr/Makefile-level2 2010-03-11 18:44:41 UTC (rev 1022) @@ -19,7 +19,7 @@ VERSION_MAJOR = 3 VERSION_MINOR = 0 -VERSION_MICRO = 1 +VERSION_MICRO = 2 VERSION_SPECIAL= novlio cvs_ver = BOOTLDR_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO} Modified: balloon/branches/novlio-ncs1/bootldr/Makefile-level2 =================================================================== --- balloon/branches/novlio-ncs1/bootldr/Makefile-level2 2010-03-11 18:26:47 UTC (rev 1021) +++ balloon/branches/novlio-ncs1/bootldr/Makefile-level2 2010-03-11 18:44:41 UTC (rev 1022) @@ -19,7 +19,7 @@ VERSION_MAJOR = 3 VERSION_MINOR = 0 -VERSION_MICRO = 1 +VERSION_MICRO = 2 VERSION_SPECIAL= novlio-ncs1 cvs_ver = BOOTLDR_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO} Modified: balloon/branches/novlio-ncs1/bootldr/btflash.c =================================================================== --- balloon/branches/novlio-ncs1/bootldr/btflash.c 2010-03-11 18:26:47 UTC (rev 1021) +++ balloon/branches/novlio-ncs1/bootldr/btflash.c 2010-03-11 18:44:41 UTC (rev 1022) @@ -343,7 +343,32 @@ #endif }; +// M29W640G has the same sector and partition layout as 29LV650 +static struct FlashDescriptor flashDescriptor_M29W640G_1x16= { + "M29W640G_1x16", + 0x20, 0x227e, + &amdFlashAlgorithm_1x16, + sizeof(flashSectors_MBM29LV650UE_1x16)/sizeof(dword) - 1, flashSectors_MBM29LV650UE_1x16, + { "bootldr", 0x00000000, BOOTLDR_SIZE, LFR_BOOTLDR }, +#if defined(CONFIG_MACH_BALLOON) && defined(CONFIG_PXA) +#if defined(CONFIG_BALLOON_FPGA) +#define FPGA_IMAGE_SIZE 0x100000L + { "fpga", FPGA_IMAGE_ADDRESS, FPGA_IMAGE_SIZE, 0 }, #else +#define FPGA__IMAGE_ADDRESS BOOTLDR_SIZE +#define FPGA_IMAGE_SIZE 0 +#endif + { "kernel", FPGA_IMAGE_ADDRESS+FPGA_IMAGE_SIZE, BOOT_SIZE, 0 }, +#endif +#if defined(CONFIG_NAND) && defined(CONFIG_YAFFS_BOOTLDR) + { "boot", 0x00000000, BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS }, + { "root", BOOT_SIZE, NAND_SIZE-BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS } +#else +// { "boot", BOOTLDR_SIZE, BOOT_SIZE, 0 }, + { "root", BOOTLDR_SIZE+BOOT_SIZE, 0, 0 } +#endif +}; +#else static struct FlashDescriptor flashDescriptor_Am29LV160BB = { "Am29LV160BB", bothbanks(1), bothbanks(0x2249), @@ -1221,6 +1246,7 @@ &flashDescriptor_MBM29LV400TC_1x16, &flashDescriptor_MBM29LV650UE_1x16, &flashDescriptor_S29GL064A_1x16, + &flashDescriptor_M29W640G_1x16, #endif #endif #if defined(CONFIG_MACH_IPAQ) Modified: balloon/trunk/bootldr/Makefile-level2 =================================================================== --- balloon/trunk/bootldr/Makefile-level2 2010-03-11 18:26:47 UTC (rev 1021) +++ balloon/trunk/bootldr/Makefile-level2 2010-03-11 18:44:41 UTC (rev 1022) @@ -19,7 +19,7 @@ VERSION_MAJOR = 3 VERSION_MINOR = 1 -VERSION_MICRO = 0 +VERSION_MICRO = 2 VERSION_SPECIAL= cvs_ver = BOOTLDR_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO} Modified: balloon/trunk/bootldr/btflash.c =================================================================== --- balloon/trunk/bootldr/btflash.c 2010-03-11 18:26:47 UTC (rev 1021) +++ balloon/trunk/bootldr/btflash.c 2010-03-11 18:44:41 UTC (rev 1022) @@ -343,7 +343,32 @@ #endif }; +// M29W640G has the same sector and partition layout as 29LV650 +static struct FlashDescriptor flashDescriptor_M29W640G_1x16= { + "M29W640G_1x16", + 0x20, 0x227e, + &amdFlashAlgorithm_1x16, + sizeof(flashSectors_MBM29LV650UE_1x16)/sizeof(dword) - 1, flashSectors_MBM29LV650UE_1x16, + { "bootldr", 0x00000000, BOOTLDR_SIZE, LFR_BOOTLDR }, +#if defined(CONFIG_MACH_BALLOON) && defined(CONFIG_PXA) +#if defined(CONFIG_BALLOON_FPGA) +#define FPGA_IMAGE_SIZE 0x100000L + { "fpga", FPGA_IMAGE_ADDRESS, FPGA_IMAGE_SIZE, 0 }, #else +#define FPGA__IMAGE_ADDRESS BOOTLDR_SIZE +#define FPGA_IMAGE_SIZE 0 +#endif + { "kernel", FPGA_IMAGE_ADDRESS+FPGA_IMAGE_SIZE, BOOT_SIZE, 0 }, +#endif +#if defined(CONFIG_NAND) && defined(CONFIG_YAFFS_BOOTLDR) + { "boot", 0x00000000, BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS }, + { "root", BOOT_SIZE, NAND_SIZE-BOOT_SIZE, LFR_NAND | LFR_NAND_YAFFS } +#else +// { "boot", BOOTLDR_SIZE, BOOT_SIZE, 0 }, + { "root", BOOTLDR_SIZE+BOOT_SIZE, 0, 0 } +#endif +}; +#else static struct FlashDescriptor flashDescriptor_Am29LV160BB = { "Am29LV160BB", bothbanks(1), bothbanks(0x2249), @@ -1221,6 +1246,7 @@ &flashDescriptor_MBM29LV400TC_1x16, &flashDescriptor_MBM29LV650UE_1x16, &flashDescriptor_S29GL064A_1x16, + &flashDescriptor_M29W640G_1x16, #endif #endif #if defined(CONFIG_MACH_IPAQ)