diff options
Diffstat (limited to 'multitech/recipes/u-boot/u-boot-2012.10')
| -rw-r--r-- | multitech/recipes/u-boot/u-boot-2012.10/mtocgd2/u-boot-2012.10-mtocgd2.patch (renamed from multitech/recipes/u-boot/u-boot-2012.10/mtocgd3/u-boot-2012.10-mtocgd3.patch) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd3/u-boot-2012.10-mtocgd3.patch b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd2/u-boot-2012.10-mtocgd2.patch index dbe3247..cfd1225 100644 --- a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd3/u-boot-2012.10-mtocgd3.patch +++ b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd2/u-boot-2012.10-mtocgd2.patch @@ -15,7 +15,7 @@ Index: git/board/atmel/at91sam9x5ek/at91sam9x5ek.c #ifdef CONFIG_MACB if (has_emac0()) -+ /* MTOCGD3: use phy addr 5 for ethernet switch */ ++ /* MTOCGD2: use phy addr 5 for ethernet switch */ rc = macb_eth_initialize(0, - (void *)ATMEL_BASE_EMAC0, 0x00); + (void *)ATMEL_BASE_EMAC0, 0x05); @@ -30,7 +30,7 @@ Index: git/include/configs/at91sam9x5ek.h #define CONFIG_USART_ID ATMEL_ID_SYS /* LCD */ -+/* MTOCGD3 has no LCD ++/* MTOCGD2 has no LCD #define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 @@ -47,14 +47,14 @@ Index: git/include/configs/at91sam9x5ek.h #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4 -#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 -+/* MTOCGD3: nand ready is on PC31 */ ++/* MTOCGD2: nand ready is on PC31 */ +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC31 /* PMECC & PMERRLOC */ #define CONFIG_ATMEL_NAND_HWECC 1 #define CONFIG_ATMEL_NAND_HW_PMECC 1 -#define CONFIG_PMECC_CAP 2 -+/* MTOCGD3: 4-bit PMECC */ ++/* MTOCGD2: 4-bit PMECC */ +#define CONFIG_PMECC_CAP 4 #define CONFIG_PMECC_SECTOR_SIZE 512 #define CONFIG_PMECC_INDEX_TABLE_OFFSET 0x8000 @@ -64,11 +64,11 @@ Index: git/include/configs/at91sam9x5ek.h /* Ethernet */ #define CONFIG_MACB -#define CONFIG_RMII -+/* MTOCGD3 is MII */ ++/* MTOCGD2 is MII */ +#undef CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_MACB_SEARCH_PHY -+/* MTOCGD3: MAC is connected to fixed-speed PHY on ethernet switch */ ++/* MTOCGD2: MAC is connected to fixed-speed PHY on ethernet switch */ +#undef CONFIG_MACB_SEARCH_PHY +#define CONFIG_FIXED_PHY 1 +/* enable MII command */ @@ -83,7 +83,7 @@ Index: git/include/configs/at91sam9x5ek.h -#define CONFIG_BOOTCOMMAND "nand read " \ - "0x22000000 0x200000 0x300000; " \ - "bootm 0x22000000" -+/* MTOCGD3: read from env variables for boot */ ++/* MTOCGD2: read from env variables for boot */ +#define CONFIG_BOOTCOMMAND "nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}" #else #ifdef CONFIG_SYS_USE_SPIFLASH @@ -97,7 +97,7 @@ Index: git/include/configs/at91sam9x5ek.h - "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock1 rw " \ - "rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs" -+/* MTOCGD3: rootfs is jffs2 */ ++/* MTOCGD2: rootfs is jffs2 */ +#define CONFIG_BOOTARGS "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2" #define CONFIG_BAUDRATE 115200 @@ -106,7 +106,7 @@ Index: git/include/configs/at91sam9x5ek.h #error CONFIG_USE_IRQ not supported #endif -+// MTOCGD3 defaults ++// MTOCGD2 defaults +#define CONFIG_ENV_OVERWRITE 1 /* Allow Overwrite of serial# & ethaddr */ +#define CONFIG_ETHADDR 00:08:00:87:00:02 +#define CONFIG_IPADDR 192.168.2.1 @@ -115,7 +115,7 @@ Index: git/include/configs/at91sam9x5ek.h +#define CONFIG_HOSTNAME AT91SAM9G25 +#define CONFIG_LOADADDR 0x22000000 + -+// MTOCGD3 - enable watchdog ++// MTOCGD2 - enable watchdog +#define CONFIG_AT91SAM9_WATCHDOG 1 +#define CONFIG_HW_WATCHDOG 1 + @@ -306,7 +306,7 @@ Index: git/drivers/net/macb.c +#ifdef CONFIG_FIXED_PHY + ncfgr = macb_readl(macb, NCFGR); -+ // MTOCGD3: force link to 100, full duplex ++ // MTOCGD2: force link to 100, full duplex + ncfgr |= MACB_BIT(SPD); + ncfgr |= MACB_BIT(FD); + macb_writel(macb, NCFGR, ncfgr); @@ -336,7 +336,7 @@ Index: git/drivers/net/macb.c miiphy_register(netdev->name, macb_miiphy_read, macb_miiphy_write); #endif + -+ // MTOCGD3: enable micrel switch ++ // MTOCGD2: enable micrel switch + macb_miiphy_write("macb0", 6, 1, 0x41); + return 0; |