|
|
@ -39,11 +39,10 @@ |
|
|
|
#define RB2011_GPIO_NAND_NCE 14 |
|
|
|
#define RB2011_GPIO_NAND_NCE 14 |
|
|
|
|
|
|
|
|
|
|
|
#define RB_ROUTERBOOT_OFFSET 0x0000 |
|
|
|
#define RB_ROUTERBOOT_OFFSET 0x0000 |
|
|
|
#define RB_ROUTERBOOT_SIZE 0xb000 |
|
|
|
#define RB_ROUTERBOOT_MIN_SIZE 0xb000 |
|
|
|
#define RB_HARD_CFG_OFFSET 0xb000 |
|
|
|
|
|
|
|
#define RB_HARD_CFG_SIZE 0x1000 |
|
|
|
#define RB_HARD_CFG_SIZE 0x1000 |
|
|
|
#define RB_BIOS_OFFSET 0xd000 |
|
|
|
#define RB_BIOS_OFFSET 0xd000 |
|
|
|
#define RB_BIOS_SIZE 0x2000 |
|
|
|
#define RB_BIOS_SIZE 0x1000 |
|
|
|
#define RB_SOFT_CFG_OFFSET 0xf000 |
|
|
|
#define RB_SOFT_CFG_OFFSET 0xf000 |
|
|
|
#define RB_SOFT_CFG_SIZE 0x1000 |
|
|
|
#define RB_SOFT_CFG_SIZE 0x1000 |
|
|
|
|
|
|
|
|
|
|
@ -53,11 +52,9 @@ static struct mtd_partition rb2011_spi_partitions[] = { |
|
|
|
{ |
|
|
|
{ |
|
|
|
.name = "routerboot", |
|
|
|
.name = "routerboot", |
|
|
|
.offset = RB_ROUTERBOOT_OFFSET, |
|
|
|
.offset = RB_ROUTERBOOT_OFFSET, |
|
|
|
.size = RB_ROUTERBOOT_SIZE, |
|
|
|
|
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
}, { |
|
|
|
}, { |
|
|
|
.name = "hard_config", |
|
|
|
.name = "hard_config", |
|
|
|
.offset = RB_HARD_CFG_OFFSET, |
|
|
|
|
|
|
|
.size = RB_HARD_CFG_SIZE, |
|
|
|
.size = RB_HARD_CFG_SIZE, |
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
}, { |
|
|
|
}, { |
|
|
@ -67,11 +64,29 @@ static struct mtd_partition rb2011_spi_partitions[] = { |
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
.mask_flags = MTD_WRITEABLE, |
|
|
|
}, { |
|
|
|
}, { |
|
|
|
.name = "soft_config", |
|
|
|
.name = "soft_config", |
|
|
|
.offset = RB_SOFT_CFG_OFFSET, |
|
|
|
|
|
|
|
.size = RB_SOFT_CFG_SIZE, |
|
|
|
.size = RB_SOFT_CFG_SIZE, |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void __init rb2011_init_partitions(void) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
u8 *addr = (u8 *) KSEG1ADDR(0x1f000000); |
|
|
|
|
|
|
|
u32 next = RB_ROUTERBOOT_MIN_SIZE; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (routerboot_find_magic(addr, 0x10000, &next, true)) |
|
|
|
|
|
|
|
printk(KERN_ERR "Warning: could not find a valid RouterBOOT hard config\n"); |
|
|
|
|
|
|
|
rb2011_spi_partitions[0].size = next; |
|
|
|
|
|
|
|
rb2011_spi_partitions[1].offset = next; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
next = RB_BIOS_OFFSET + RB_BIOS_SIZE; |
|
|
|
|
|
|
|
if (routerboot_find_magic(addr, 0x10000, &next, false)) |
|
|
|
|
|
|
|
printk(KERN_ERR "Warning: could not find a valid RouterBOOT soft config\n"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rb2011_spi_partitions[3].offset = next; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct mtd_partition rb2011_nand_partitions[] = { |
|
|
|
static struct mtd_partition rb2011_nand_partitions[] = { |
|
|
|
{ |
|
|
|
{ |
|
|
|
.name = "booter", |
|
|
|
.name = "booter", |
|
|
@ -125,13 +140,14 @@ static struct mdio_board_info rb2011_mdio0_info[] = { |
|
|
|
|
|
|
|
|
|
|
|
static void __init rb2011_wlan_init(void) |
|
|
|
static void __init rb2011_wlan_init(void) |
|
|
|
{ |
|
|
|
{ |
|
|
|
u8 *hard_cfg = (u8 *) KSEG1ADDR(0x1f000000 + RB_HARD_CFG_OFFSET); |
|
|
|
u8 *hard_cfg = (u8 *) KSEG1ADDR(0x1f000000); |
|
|
|
u16 tag_len; |
|
|
|
u16 tag_len; |
|
|
|
u8 *tag; |
|
|
|
u8 *tag; |
|
|
|
char *art_buf; |
|
|
|
char *art_buf; |
|
|
|
u8 wlan_mac[ETH_ALEN]; |
|
|
|
u8 wlan_mac[ETH_ALEN]; |
|
|
|
int err; |
|
|
|
int err; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
hard_cfg += rb2011_spi_partitions[1].offset; |
|
|
|
err = routerboot_find_tag(hard_cfg, RB_HARD_CFG_SIZE, RB_ID_WLAN_DATA, |
|
|
|
err = routerboot_find_tag(hard_cfg, RB_HARD_CFG_SIZE, RB_ID_WLAN_DATA, |
|
|
|
&tag, &tag_len); |
|
|
|
&tag, &tag_len); |
|
|
|
if (err) { |
|
|
|
if (err) { |
|
|
@ -211,6 +227,7 @@ static void __init rb2011_gpio_init(void) |
|
|
|
|
|
|
|
|
|
|
|
static void __init rb2011_setup(void) |
|
|
|
static void __init rb2011_setup(void) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
rb2011_init_partitions(); |
|
|
|
rb2011_gpio_init(); |
|
|
|
rb2011_gpio_init(); |
|
|
|
|
|
|
|
|
|
|
|
ath79_register_m25p80(&rb2011_spi_flash_data); |
|
|
|
ath79_register_m25p80(&rb2011_spi_flash_data); |
|
|
|