Refresh patches

Refresh uboot-lantiq patches.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 40546
owl
John Crispin 2014-04-22 08:08:19 +00:00
parent 686a17e647
commit 03a777c293
40 changed files with 98 additions and 908 deletions

View File

@ -5,11 +5,9 @@ Subject: sf: fix out-of-order calls for spi_claim_bus and spi_release_bus
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 108665f..d34747b 100644
--- a/drivers/mtd/spi/sf_ops.c --- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c
@@ -132,12 +132,6 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, @@ -132,12 +132,6 @@ int spi_flash_write_common(struct spi_fl
if (buf == NULL) if (buf == NULL)
timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT; timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT;
@ -22,7 +20,7 @@ index 108665f..d34747b 100644
ret = spi_flash_cmd_write_enable(flash); ret = spi_flash_cmd_write_enable(flash);
if (ret < 0) { if (ret < 0) {
debug("SF: enabling write failed\n"); debug("SF: enabling write failed\n");
@@ -158,8 +152,6 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, @@ -158,8 +152,6 @@ int spi_flash_write_common(struct spi_fl
return ret; return ret;
} }
@ -31,7 +29,7 @@ index 108665f..d34747b 100644
return ret; return ret;
} }
@@ -175,12 +167,18 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) @@ -175,12 +167,18 @@ int spi_flash_cmd_erase_ops(struct spi_f
return -1; return -1;
} }
@ -51,7 +49,7 @@ index 108665f..d34747b 100644
#endif #endif
spi_flash_addr(offset, cmd); spi_flash_addr(offset, cmd);
@@ -190,13 +188,16 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) @@ -190,13 +188,16 @@ int spi_flash_cmd_erase_ops(struct spi_f
ret = spi_flash_write_common(flash, cmd, sizeof(cmd), NULL, 0); ret = spi_flash_write_common(flash, cmd, sizeof(cmd), NULL, 0);
if (ret < 0) { if (ret < 0) {
debug("SF: erase failed\n"); debug("SF: erase failed\n");
@ -69,7 +67,7 @@ index 108665f..d34747b 100644
return ret; return ret;
} }
@@ -208,6 +209,12 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -208,6 +209,12 @@ int spi_flash_cmd_write_ops(struct spi_f
u8 cmd[4]; u8 cmd[4];
int ret = -1; int ret = -1;
@ -82,7 +80,7 @@ index 108665f..d34747b 100644
page_size = flash->page_size; page_size = flash->page_size;
cmd[0] = CMD_PAGE_PROGRAM; cmd[0] = CMD_PAGE_PROGRAM;
@@ -215,7 +222,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -215,7 +222,7 @@ int spi_flash_cmd_write_ops(struct spi_f
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
ret = spi_flash_bank(flash, offset); ret = spi_flash_bank(flash, offset);
if (ret < 0) if (ret < 0)
@ -91,7 +89,7 @@ index 108665f..d34747b 100644
#endif #endif
byte_addr = offset % page_size; byte_addr = offset % page_size;
chunk_len = min(len - actual, page_size - byte_addr); chunk_len = min(len - actual, page_size - byte_addr);
@@ -232,12 +239,15 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -232,12 +239,15 @@ int spi_flash_cmd_write_ops(struct spi_f
buf + actual, chunk_len); buf + actual, chunk_len);
if (ret < 0) { if (ret < 0) {
debug("SF: write failed\n"); debug("SF: write failed\n");
@ -108,7 +106,7 @@ index 108665f..d34747b 100644
return ret; return ret;
} }
@@ -247,20 +257,12 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, @@ -247,20 +257,12 @@ int spi_flash_read_common(struct spi_fla
struct spi_slave *spi = flash->spi; struct spi_slave *spi = flash->spi;
int ret; int ret;
@ -129,7 +127,7 @@ index 108665f..d34747b 100644
return ret; return ret;
} }
@@ -271,6 +273,12 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -271,6 +273,12 @@ int spi_flash_cmd_read_ops(struct spi_fl
u32 remain_len, read_len; u32 remain_len, read_len;
int ret = -1; int ret = -1;
@ -142,7 +140,7 @@ index 108665f..d34747b 100644
/* Handle memory-mapped SPI */ /* Handle memory-mapped SPI */
if (flash->memory_map) { if (flash->memory_map) {
spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP); spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
@@ -289,7 +297,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -289,7 +297,7 @@ int spi_flash_cmd_read_ops(struct spi_fl
ret = spi_flash_cmd_bankaddr_write(flash, bank_sel); ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
if (ret) { if (ret) {
debug("SF: fail to set bank%d\n", bank_sel); debug("SF: fail to set bank%d\n", bank_sel);
@ -151,7 +149,7 @@ index 108665f..d34747b 100644
} }
#endif #endif
remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset; remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
@@ -304,7 +312,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -304,7 +312,7 @@ int spi_flash_cmd_read_ops(struct spi_fl
data, read_len); data, read_len);
if (ret < 0) { if (ret < 0) {
debug("SF: read failed\n"); debug("SF: read failed\n");
@ -160,7 +158,7 @@ index 108665f..d34747b 100644
} }
offset += read_len; offset += read_len;
@@ -312,6 +320,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -312,6 +320,9 @@ int spi_flash_cmd_read_ops(struct spi_fl
data += read_len; data += read_len;
} }
@ -170,6 +168,3 @@ index 108665f..d34747b 100644
return ret; return ret;
} }
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: sf: consistently use debug() for warning/error messages
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 5eb8ffe..04356f1 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -176,8 +176,8 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, @@ -176,8 +176,8 @@ static struct spi_flash *spi_flash_valid
} }
if (i == ARRAY_SIZE(spi_flash_params_table)) { if (i == ARRAY_SIZE(spi_flash_params_table)) {
@ -20,7 +18,7 @@ index 5eb8ffe..04356f1 100644
idcode[0], jedec, ext_jedec); idcode[0], jedec, ext_jedec);
return NULL; return NULL;
} }
@@ -296,7 +296,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -296,7 +296,7 @@ struct spi_flash *spi_flash_probe(unsign
/* Setup spi_slave */ /* Setup spi_slave */
spi = spi_setup_slave(bus, cs, max_hz, spi_mode); spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
if (!spi) { if (!spi) {
@ -29,7 +27,7 @@ index 5eb8ffe..04356f1 100644
return NULL; return NULL;
} }
@@ -310,7 +310,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -310,7 +310,7 @@ struct spi_flash *spi_flash_probe(unsign
/* Read the ID codes */ /* Read the ID codes */
ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
if (ret) { if (ret) {
@ -38,7 +36,7 @@ index 5eb8ffe..04356f1 100644
goto err_read_id; goto err_read_id;
} }
@@ -341,8 +341,8 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -341,8 +341,8 @@ struct spi_flash *spi_flash_probe(unsign
#endif #endif
#ifndef CONFIG_SPI_FLASH_BAR #ifndef CONFIG_SPI_FLASH_BAR
if (flash->size > SPI_FLASH_16MB_BOUN) { if (flash->size > SPI_FLASH_16MB_BOUN) {
@ -49,6 +47,3 @@ index 5eb8ffe..04356f1 100644
} }
#endif #endif
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: sf: move malloc of spi_flash to spi_flash_probe()
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 04356f1..2bba10c 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -153,11 +153,10 @@ static const struct spi_flash_params spi_flash_params_table[] = { @@ -153,11 +153,10 @@ static const struct spi_flash_params spi
*/ */
}; };
@ -22,7 +20,7 @@ index 04356f1..2bba10c 100644
int i; int i;
u16 jedec = idcode[1] << 8 | idcode[2]; u16 jedec = idcode[1] << 8 | idcode[2];
u16 ext_jedec = idcode[3] << 8 | idcode[4]; u16 ext_jedec = idcode[3] << 8 | idcode[4];
@@ -179,20 +178,12 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, @@ -179,20 +178,12 @@ static struct spi_flash *spi_flash_valid
debug("SF: Unsupported flash IDs: "); debug("SF: Unsupported flash IDs: ");
debug("manuf %02x, jedec %04x, ext_jedec %04x\n", debug("manuf %02x, jedec %04x, ext_jedec %04x\n",
idcode[0], jedec, ext_jedec); idcode[0], jedec, ext_jedec);
@ -45,7 +43,7 @@ index 04356f1..2bba10c 100644
/* Assign spi_flash ops */ /* Assign spi_flash ops */
flash->write = spi_flash_cmd_write_ops; flash->write = spi_flash_cmd_write_ops;
@@ -239,7 +230,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, @@ -239,7 +230,7 @@ static struct spi_flash *spi_flash_valid
if (spi_flash_read_common(flash, &flash->bank_read_cmd, 1, if (spi_flash_read_common(flash, &flash->bank_read_cmd, 1,
&curr_bank, 1)) { &curr_bank, 1)) {
debug("SF: fail to read bank addr register\n"); debug("SF: fail to read bank addr register\n");
@ -54,7 +52,7 @@ index 04356f1..2bba10c 100644
} }
flash->bank_curr = curr_bank; flash->bank_curr = curr_bank;
} else { } else {
@@ -254,7 +245,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, @@ -254,7 +245,7 @@ static struct spi_flash *spi_flash_valid
spi_flash_cmd_write_status(flash, 0); spi_flash_cmd_write_status(flash, 0);
#endif #endif
@ -63,7 +61,7 @@ index 04356f1..2bba10c 100644
} }
#ifdef CONFIG_OF_CONTROL #ifdef CONFIG_OF_CONTROL
@@ -289,15 +280,22 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -289,15 +280,22 @@ struct spi_flash *spi_flash_probe(unsign
unsigned int max_hz, unsigned int spi_mode) unsigned int max_hz, unsigned int spi_mode)
{ {
struct spi_slave *spi; struct spi_slave *spi;
@ -88,7 +86,7 @@ index 04356f1..2bba10c 100644
} }
/* Claim spi bus */ /* Claim spi bus */
@@ -320,8 +318,9 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -320,8 +318,9 @@ struct spi_flash *spi_flash_probe(unsign
#endif #endif
/* Validate params from spi_flash_params table */ /* Validate params from spi_flash_params table */
@ -110,6 +108,3 @@ index 04356f1..2bba10c 100644
return NULL; return NULL;
} }
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: sf: add slim probe funtions for SPL
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 2bba10c..380aa09 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -365,3 +365,58 @@ void spi_flash_free(struct spi_flash *flash) @@ -365,3 +365,58 @@ void spi_flash_free(struct spi_flash *fl
spi_free_slave(flash->spi); spi_free_slave(flash->spi);
free(flash); free(flash);
} }
@ -68,11 +66,9 @@ index 2bba10c..380aa09 100644
+ spi_free_slave(flash->spi); + spi_free_slave(flash->spi);
+} +}
+#endif +#endif
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 25ca8f1..411dd1b 100644
--- a/include/spi_flash.h --- a/include/spi_flash.h
+++ b/include/spi_flash.h +++ b/include/spi_flash.h
@@ -69,6 +69,9 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, @@ -69,6 +69,9 @@ struct spi_flash *spi_flash_probe(unsign
unsigned int max_hz, unsigned int spi_mode); unsigned int max_hz, unsigned int spi_mode);
void spi_flash_free(struct spi_flash *flash); void spi_flash_free(struct spi_flash *flash);
@ -82,6 +78,3 @@ index 25ca8f1..411dd1b 100644
static inline int spi_flash_read(struct spi_flash *flash, u32 offset, static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
size_t len, void *buf) size_t len, void *buf)
{ {
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: sf: make calculatiom of address bytes completely configurable
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index d34747b..207adf5 100644
--- a/drivers/mtd/spi/sf_ops.c --- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c
@@ -15,12 +15,17 @@ @@ -15,12 +15,17 @@
@ -31,7 +29,7 @@ index d34747b..207adf5 100644
} }
int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr) int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr)
@@ -158,7 +163,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, @@ -158,7 +163,7 @@ int spi_flash_write_common(struct spi_fl
int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
{ {
u32 erase_size; u32 erase_size;
@ -40,7 +38,7 @@ index d34747b..207adf5 100644
int ret = -1; int ret = -1;
erase_size = flash->erase_size; erase_size = flash->erase_size;
@@ -180,12 +185,13 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) @@ -180,12 +185,13 @@ int spi_flash_cmd_erase_ops(struct spi_f
if (ret < 0) if (ret < 0)
goto done; goto done;
#endif #endif
@ -56,7 +54,7 @@ index d34747b..207adf5 100644
if (ret < 0) { if (ret < 0) {
debug("SF: erase failed\n"); debug("SF: erase failed\n");
goto done; goto done;
@@ -206,7 +212,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -206,7 +212,7 @@ int spi_flash_cmd_write_ops(struct spi_f
{ {
unsigned long byte_addr, page_size; unsigned long byte_addr, page_size;
size_t chunk_len, actual; size_t chunk_len, actual;
@ -65,7 +63,7 @@ index d34747b..207adf5 100644
int ret = -1; int ret = -1;
ret = spi_claim_bus(flash->spi); ret = spi_claim_bus(flash->spi);
@@ -230,12 +236,13 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -230,12 +236,13 @@ int spi_flash_cmd_write_ops(struct spi_f
if (flash->spi->max_write_size) if (flash->spi->max_write_size)
chunk_len = min(chunk_len, flash->spi->max_write_size); chunk_len = min(chunk_len, flash->spi->max_write_size);
@ -81,7 +79,7 @@ index d34747b..207adf5 100644
buf + actual, chunk_len); buf + actual, chunk_len);
if (ret < 0) { if (ret < 0) {
debug("SF: write failed\n"); debug("SF: write failed\n");
@@ -269,7 +276,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, @@ -269,7 +276,7 @@ int spi_flash_read_common(struct spi_fla
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
size_t len, void *data) size_t len, void *data)
{ {
@ -90,7 +88,7 @@ index d34747b..207adf5 100644
u32 remain_len, read_len; u32 remain_len, read_len;
int ret = -1; int ret = -1;
@@ -288,7 +295,6 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -288,7 +295,6 @@ int spi_flash_cmd_read_ops(struct spi_fl
} }
cmd[0] = CMD_READ_ARRAY_FAST; cmd[0] = CMD_READ_ARRAY_FAST;
@ -98,7 +96,7 @@ index d34747b..207adf5 100644
while (len) { while (len) {
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
@@ -306,9 +312,11 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -306,9 +312,11 @@ int spi_flash_cmd_read_ops(struct spi_fl
else else
read_len = remain_len; read_len = remain_len;
@ -112,11 +110,9 @@ index d34747b..207adf5 100644
data, read_len); data, read_len);
if (ret < 0) { if (ret < 0) {
debug("SF: read failed\n"); debug("SF: read failed\n");
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 380aa09..84289db 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -218,6 +218,9 @@ static int spi_flash_validate_params(struct spi_flash *flash, @@ -218,6 +218,9 @@ static int spi_flash_validate_params(str
flash->poll_cmd = CMD_FLAG_STATUS; flash->poll_cmd = CMD_FLAG_STATUS;
#endif #endif
@ -126,8 +122,6 @@ index 380aa09..84289db 100644
/* Configure the BAR - discover bank cmds and read current bank */ /* Configure the BAR - discover bank cmds and read current bank */
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
u8 curr_bank = 0; u8 curr_bank = 0;
diff --git a/include/spi_flash.h b/include/spi_flash.h
index 411dd1b..cc9398b 100644
--- a/include/spi_flash.h --- a/include/spi_flash.h
+++ b/include/spi_flash.h +++ b/include/spi_flash.h
@@ -57,6 +57,7 @@ struct spi_flash { @@ -57,6 +57,7 @@ struct spi_flash {
@ -138,6 +132,3 @@ index 411dd1b..cc9398b 100644
void *memory_map; void *memory_map;
int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf);
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: sf: add support for 4-byte addressing
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index 732ddf8..c5e8eb1 100644
--- a/drivers/mtd/spi/sf_internal.h --- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h
@@ -38,12 +38,14 @@ @@ -38,12 +38,14 @@
@ -30,11 +28,9 @@ index 732ddf8..c5e8eb1 100644
/* Common status */ /* Common status */
#define STATUS_WIP 0x01 #define STATUS_WIP 0x01
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index 207adf5..1d072f8 100644
--- a/drivers/mtd/spi/sf_ops.c --- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c
@@ -21,6 +21,7 @@ static void spi_flash_addr(const struct spi_flash *flash, u32 addr, u8 *cmd) @@ -21,6 +21,7 @@ static void spi_flash_addr(const struct
cmd[1] = addr >> (flash->addr_width * 8 - 8); cmd[1] = addr >> (flash->addr_width * 8 - 8);
cmd[2] = addr >> (flash->addr_width * 8 - 16); cmd[2] = addr >> (flash->addr_width * 8 - 16);
cmd[3] = addr >> (flash->addr_width * 8 - 24); cmd[3] = addr >> (flash->addr_width * 8 - 24);
@ -42,7 +38,7 @@ index 207adf5..1d072f8 100644
} }
static int spi_flash_cmdsz(const struct spi_flash *flash) static int spi_flash_cmdsz(const struct spi_flash *flash)
@@ -163,7 +164,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, @@ -163,7 +164,7 @@ int spi_flash_write_common(struct spi_fl
int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
{ {
u32 erase_size; u32 erase_size;
@ -51,7 +47,7 @@ index 207adf5..1d072f8 100644
int ret = -1; int ret = -1;
erase_size = flash->erase_size; erase_size = flash->erase_size;
@@ -188,8 +189,8 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) @@ -188,8 +189,8 @@ int spi_flash_cmd_erase_ops(struct spi_f
spi_flash_addr(flash, offset, cmd); spi_flash_addr(flash, offset, cmd);
cmd_len = spi_flash_cmdsz(flash); cmd_len = spi_flash_cmdsz(flash);
@ -62,7 +58,7 @@ index 207adf5..1d072f8 100644
ret = spi_flash_write_common(flash, cmd, cmd_len, NULL, 0); ret = spi_flash_write_common(flash, cmd, cmd_len, NULL, 0);
if (ret < 0) { if (ret < 0) {
@@ -212,7 +213,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -212,7 +213,7 @@ int spi_flash_cmd_write_ops(struct spi_f
{ {
unsigned long byte_addr, page_size; unsigned long byte_addr, page_size;
size_t chunk_len, actual; size_t chunk_len, actual;
@ -71,7 +67,7 @@ index 207adf5..1d072f8 100644
int ret = -1; int ret = -1;
ret = spi_claim_bus(flash->spi); ret = spi_claim_bus(flash->spi);
@@ -239,8 +240,8 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, @@ -239,8 +240,8 @@ int spi_flash_cmd_write_ops(struct spi_f
spi_flash_addr(flash, offset, cmd); spi_flash_addr(flash, offset, cmd);
cmd_len = spi_flash_cmdsz(flash); cmd_len = spi_flash_cmdsz(flash);
@ -82,7 +78,7 @@ index 207adf5..1d072f8 100644
ret = spi_flash_write_common(flash, cmd, cmd_len, ret = spi_flash_write_common(flash, cmd, cmd_len,
buf + actual, chunk_len); buf + actual, chunk_len);
@@ -276,9 +277,13 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, @@ -276,9 +277,13 @@ int spi_flash_read_common(struct spi_fla
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
size_t len, void *data) size_t len, void *data)
{ {
@ -98,7 +94,7 @@ index 207adf5..1d072f8 100644
ret = spi_claim_bus(flash->spi); ret = spi_claim_bus(flash->spi);
if (ret) { if (ret) {
@@ -305,12 +310,15 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, @@ -305,12 +310,15 @@ int spi_flash_cmd_read_ops(struct spi_fl
debug("SF: fail to set bank%d\n", bank_sel); debug("SF: fail to set bank%d\n", bank_sel);
goto done; goto done;
} }
@ -115,11 +111,9 @@ index 207adf5..1d072f8 100644
spi_flash_addr(flash, offset, cmd); spi_flash_addr(flash, offset, cmd);
cmd_len = spi_flash_cmdsz(flash); cmd_len = spi_flash_cmdsz(flash);
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 84289db..ac44287 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -153,6 +153,25 @@ static const struct spi_flash_params spi_flash_params_table[] = { @@ -153,6 +153,25 @@ static const struct spi_flash_params spi
*/ */
}; };
@ -145,7 +139,7 @@ index 84289db..ac44287 100644
static int spi_flash_validate_params(struct spi_flash *flash, static int spi_flash_validate_params(struct spi_flash *flash,
u8 *idcode) u8 *idcode)
{ {
@@ -218,8 +237,18 @@ static int spi_flash_validate_params(struct spi_flash *flash, @@ -218,8 +237,18 @@ static int spi_flash_validate_params(str
flash->poll_cmd = CMD_FLAG_STATUS; flash->poll_cmd = CMD_FLAG_STATUS;
#endif #endif
@ -164,6 +158,3 @@ index 84289db..ac44287 100644
/* Configure the BAR - discover bank cmds and read current bank */ /* Configure the BAR - discover bank cmds and read current bank */
#ifdef CONFIG_SPI_FLASH_BAR #ifdef CONFIG_SPI_FLASH_BAR
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: sf: add support for EN25QH256
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index ac44287..7e87021 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -53,6 +53,7 @@ static const struct spi_flash_params spi_flash_params_table[] = { @@ -53,6 +53,7 @@ static const struct spi_flash_params spi
{"EN25Q64", 0x1c3017, 0x0, 64 * 1024, 128, SECT_4K}, {"EN25Q64", 0x1c3017, 0x0, 64 * 1024, 128, SECT_4K},
{"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0}, {"EN25Q128B", 0x1c3018, 0x0, 64 * 1024, 256, 0},
{"EN25S64", 0x1c3817, 0x0, 64 * 1024, 128, 0}, {"EN25S64", 0x1c3817, 0x0, 64 * 1024, 128, 0},
@ -17,6 +15,3 @@ index ac44287..7e87021 100644
#endif #endif
#ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */ #ifdef CONFIG_SPI_FLASH_GIGADEVICE /* GIGADEVICE */
{"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, SECT_4K}, {"GD25Q64B", 0xc84017, 0x0, 64 * 1024, 128, SECT_4K},
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: sf: fix sector layout of S25FL256S_256K and S25FL512S_256K
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 7e87021..1fc224e 100644
--- a/drivers/mtd/spi/sf_probe.c --- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c
@@ -80,9 +80,9 @@ static const struct spi_flash_params spi_flash_params_table[] = { @@ -80,9 +80,9 @@ static const struct spi_flash_params spi
{"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0}, {"S25FL032P", 0x010215, 0x4d00, 64 * 1024, 64, 0},
{"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0}, {"S25FL064P", 0x010216, 0x4d00, 64 * 1024, 128, 0},
{"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0}, {"S25FL128S_64K", 0x012018, 0x4d01, 64 * 1024, 256, 0},
@ -21,6 +19,3 @@ index 7e87021..1fc224e 100644
{"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0}, {"S25FL512S_64K", 0x010220, 0x4d01, 64 * 1024, 1024, 0},
#endif #endif
#ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */ #ifdef CONFIG_SPI_FLASH_STMICRO /* STMICRO */
--
1.8.3.2

View File

@ -10,8 +10,6 @@ setup code for switch devices across different boards.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Joe Hershberger <joe.hershberger@gmail.com>
diff --git a/Makefile b/Makefile
index dc04179..6ee9a3c 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -280,6 +280,7 @@ LIBS-y += drivers/mtd/ubi/libubi.o @@ -280,6 +280,7 @@ LIBS-y += drivers/mtd/ubi/libubi.o
@ -22,9 +20,6 @@ index dc04179..6ee9a3c 100644
LIBS-y += drivers/pci/libpci.o LIBS-y += drivers/pci/libpci.o
LIBS-y += drivers/pcmcia/libpcmcia.o LIBS-y += drivers/pcmcia/libpcmcia.o
LIBS-y += drivers/power/libpower.o \ LIBS-y += drivers/power/libpower.o \
diff --git a/drivers/net/switch/Makefile b/drivers/net/switch/Makefile
new file mode 100644
index 0000000..31719d8
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/Makefile +++ b/drivers/net/switch/Makefile
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -58,9 +53,6 @@ index 0000000..31719d8
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/drivers/net/switch/switch.c b/drivers/net/switch/switch.c
new file mode 100644
index 0000000..0e1d6b7
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/switch.c +++ b/drivers/net/switch/switch.c
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
@ -126,9 +118,6 @@ index 0000000..0e1d6b7
+ +
+ return NULL; + return NULL;
+} +}
diff --git a/include/switch.h b/include/switch.h
new file mode 100644
index 0000000..4a7ae63
--- /dev/null --- /dev/null
+++ b/include/switch.h +++ b/include/switch.h
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
@ -234,8 +223,6 @@ index 0000000..4a7ae63
+ +
+#endif /* __SWITCH_H */ +#endif /* __SWITCH_H */
+ +
diff --git a/net/eth.c b/net/eth.c
index c96e767..03ecc1c 100644
--- a/net/eth.c --- a/net/eth.c
+++ b/net/eth.c +++ b/net/eth.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -255,6 +242,3 @@ index c96e767..03ecc1c 100644
eth_env_init(bis); eth_env_init(bis);
/* /*
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: net: switchlib: add driver for Lantiq PSB697X switch family
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/net/switch/Makefile b/drivers/net/switch/Makefile
index 31719d8..a426774 100644
--- a/drivers/net/switch/Makefile --- a/drivers/net/switch/Makefile
+++ b/drivers/net/switch/Makefile +++ b/drivers/net/switch/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/config.mk @@ -10,6 +10,7 @@ include $(TOPDIR)/config.mk
@ -17,9 +15,6 @@ index 31719d8..a426774 100644
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
diff --git a/drivers/net/switch/psb697x.c b/drivers/net/switch/psb697x.c
new file mode 100644
index 0000000..cb6c391
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/psb697x.c +++ b/drivers/net/switch/psb697x.c
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
@ -141,8 +136,6 @@ index 0000000..cb6c391
+ +
+ switch_driver_register(&psb697x_drv); + switch_driver_register(&psb697x_drv);
+} +}
diff --git a/drivers/net/switch/switch.c b/drivers/net/switch/switch.c
index 0e1d6b7..3d02610 100644
--- a/drivers/net/switch/switch.c --- a/drivers/net/switch/switch.c
+++ b/drivers/net/switch/switch.c +++ b/drivers/net/switch/switch.c
@@ -17,6 +17,10 @@ void switch_init(void) @@ -17,6 +17,10 @@ void switch_init(void)
@ -156,11 +149,9 @@ index 0e1d6b7..3d02610 100644
board_switch_init(); board_switch_init();
} }
diff --git a/include/switch.h b/include/switch.h
index 4a7ae63..fd3cdbd 100644
--- a/include/switch.h --- a/include/switch.h
+++ b/include/switch.h +++ b/include/switch.h
@@ -97,6 +97,7 @@ static inline void switch_setup(struct switch_device *dev) @@ -97,6 +97,7 @@ static inline void switch_setup(struct s
} }
/* Init functions for supported Switch drivers */ /* Init functions for supported Switch drivers */
@ -168,6 +159,3 @@ index 4a7ae63..fd3cdbd 100644
#endif /* __SWITCH_H */ #endif /* __SWITCH_H */
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: net: switchlib: add driver for Lantiq ADM6996I switch family
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/net/switch/Makefile b/drivers/net/switch/Makefile
index a426774..6b7eeb9 100644
--- a/drivers/net/switch/Makefile --- a/drivers/net/switch/Makefile
+++ b/drivers/net/switch/Makefile +++ b/drivers/net/switch/Makefile
@@ -11,6 +11,7 @@ LIB := $(obj)libswitch.o @@ -11,6 +11,7 @@ LIB := $(obj)libswitch.o
@ -17,9 +15,6 @@ index a426774..6b7eeb9 100644
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
diff --git a/drivers/net/switch/adm6996i.c b/drivers/net/switch/adm6996i.c
new file mode 100644
index 0000000..46fcdc9
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/adm6996i.c +++ b/drivers/net/switch/adm6996i.c
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
@ -138,8 +133,6 @@ index 0000000..46fcdc9
+ +
+ switch_driver_register(&adm6996i_drv); + switch_driver_register(&adm6996i_drv);
+} +}
diff --git a/drivers/net/switch/switch.c b/drivers/net/switch/switch.c
index 3d02610..ea3fe9c 100644
--- a/drivers/net/switch/switch.c --- a/drivers/net/switch/switch.c
+++ b/drivers/net/switch/switch.c +++ b/drivers/net/switch/switch.c
@@ -20,6 +20,9 @@ void switch_init(void) @@ -20,6 +20,9 @@ void switch_init(void)
@ -152,11 +145,9 @@ index 3d02610..ea3fe9c 100644
board_switch_init(); board_switch_init();
} }
diff --git a/include/switch.h b/include/switch.h
index fd3cdbd..4b46df0 100644
--- a/include/switch.h --- a/include/switch.h
+++ b/include/switch.h +++ b/include/switch.h
@@ -98,6 +98,7 @@ static inline void switch_setup(struct switch_device *dev) @@ -98,6 +98,7 @@ static inline void switch_setup(struct s
/* Init functions for supported Switch drivers */ /* Init functions for supported Switch drivers */
extern void switch_psb697x_init(void); extern void switch_psb697x_init(void);
@ -164,6 +155,3 @@ index fd3cdbd..4b46df0 100644
#endif /* __SWITCH_H */ #endif /* __SWITCH_H */
--
1.8.3.2

View File

@ -6,8 +6,6 @@ Subject: net: switchlib: add driver for Atheros AR8216
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/net/switch/Makefile b/drivers/net/switch/Makefile
index 6b7eeb9..7400897 100644
--- a/drivers/net/switch/Makefile --- a/drivers/net/switch/Makefile
+++ b/drivers/net/switch/Makefile +++ b/drivers/net/switch/Makefile
@@ -12,6 +12,7 @@ LIB := $(obj)libswitch.o @@ -12,6 +12,7 @@ LIB := $(obj)libswitch.o
@ -18,9 +16,6 @@ index 6b7eeb9..7400897 100644
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
diff --git a/drivers/net/switch/ar8216.c b/drivers/net/switch/ar8216.c
new file mode 100644
index 0000000..f1348f0
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/ar8216.c +++ b/drivers/net/switch/ar8216.c
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
@ -138,8 +133,6 @@ index 0000000..f1348f0
+ +
+ switch_driver_register(&ar8216_drv); + switch_driver_register(&ar8216_drv);
+} +}
diff --git a/drivers/net/switch/switch.c b/drivers/net/switch/switch.c
index ea3fe9c..3e34a7f 100644
--- a/drivers/net/switch/switch.c --- a/drivers/net/switch/switch.c
+++ b/drivers/net/switch/switch.c +++ b/drivers/net/switch/switch.c
@@ -23,6 +23,9 @@ void switch_init(void) @@ -23,6 +23,9 @@ void switch_init(void)
@ -152,11 +145,9 @@ index ea3fe9c..3e34a7f 100644
board_switch_init(); board_switch_init();
} }
diff --git a/include/switch.h b/include/switch.h
index 4b46df0..ae7b123 100644
--- a/include/switch.h --- a/include/switch.h
+++ b/include/switch.h +++ b/include/switch.h
@@ -99,6 +99,7 @@ static inline void switch_setup(struct switch_device *dev) @@ -99,6 +99,7 @@ static inline void switch_setup(struct s
/* Init functions for supported Switch drivers */ /* Init functions for supported Switch drivers */
extern void switch_psb697x_init(void); extern void switch_psb697x_init(void);
extern void switch_adm6996i_init(void); extern void switch_adm6996i_init(void);
@ -164,6 +155,3 @@ index 4b46df0..ae7b123 100644
#endif /* __SWITCH_H */ #endif /* __SWITCH_H */
--
1.8.3.2

View File

@ -6,8 +6,6 @@ Subject: net: switchlib: add driver for REALTEK RTL8306
Signed-off-by: Oliver Muth <dr.o.muth@gmx.de> Signed-off-by: Oliver Muth <dr.o.muth@gmx.de>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/drivers/net/switch/Makefile b/drivers/net/switch/Makefile
index 7400897..08c6972 100644
--- a/drivers/net/switch/Makefile --- a/drivers/net/switch/Makefile
+++ b/drivers/net/switch/Makefile +++ b/drivers/net/switch/Makefile
@@ -13,6 +13,7 @@ COBJS-$(CONFIG_SWITCH_MULTI) += switch.o @@ -13,6 +13,7 @@ COBJS-$(CONFIG_SWITCH_MULTI) += switch.o
@ -18,9 +16,6 @@ index 7400897..08c6972 100644
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)
diff --git a/drivers/net/switch/rtl8306.c b/drivers/net/switch/rtl8306.c
new file mode 100644
index 0000000..7a6a917
--- /dev/null --- /dev/null
+++ b/drivers/net/switch/rtl8306.c +++ b/drivers/net/switch/rtl8306.c
@@ -0,0 +1,332 @@ @@ -0,0 +1,332 @@
@ -356,8 +351,6 @@ index 0000000..7a6a917
+ +
+ switch_driver_register(&rtl8306_drv); + switch_driver_register(&rtl8306_drv);
+} +}
diff --git a/drivers/net/switch/switch.c b/drivers/net/switch/switch.c
index 3e34a7f..2e1c668 100644
--- a/drivers/net/switch/switch.c --- a/drivers/net/switch/switch.c
+++ b/drivers/net/switch/switch.c +++ b/drivers/net/switch/switch.c
@@ -26,6 +26,9 @@ void switch_init(void) @@ -26,6 +26,9 @@ void switch_init(void)
@ -370,11 +363,9 @@ index 3e34a7f..2e1c668 100644
board_switch_init(); board_switch_init();
} }
diff --git a/include/switch.h b/include/switch.h
index ae7b123..927b1d2 100644
--- a/include/switch.h --- a/include/switch.h
+++ b/include/switch.h +++ b/include/switch.h
@@ -100,6 +100,7 @@ static inline void switch_setup(struct switch_device *dev) @@ -100,6 +100,7 @@ static inline void switch_setup(struct s
extern void switch_psb697x_init(void); extern void switch_psb697x_init(void);
extern void switch_adm6996i_init(void); extern void switch_adm6996i_init(void);
extern void switch_ar8216_init(void); extern void switch_ar8216_init(void);
@ -382,6 +373,3 @@ index ae7b123..927b1d2 100644
#endif /* __SWITCH_H */ #endif /* __SWITCH_H */
--
1.8.3.2

View File

@ -6,8 +6,6 @@ Subject: MIPS: add support for Lantiq XWAY SoCs
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/.gitignore b/.gitignore
index a39bd54..7abdc37 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -49,6 +49,13 @@ @@ -49,6 +49,13 @@
@ -24,8 +22,6 @@ index a39bd54..7abdc37 100644
# #
# Generated files # Generated files
diff --git a/Makefile b/Makefile
index 6ee9a3c..73ec67d 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -435,6 +435,12 @@ $(obj)u-boot.bin: $(obj)u-boot @@ -435,6 +435,12 @@ $(obj)u-boot.bin: $(obj)u-boot
@ -67,7 +63,7 @@ index 6ee9a3c..73ec67d 100644
$(obj)u-boot.imx: $(obj)u-boot.bin depend $(obj)u-boot.imx: $(obj)u-boot.bin depend
$(MAKE) -C $(SRCTREE)/arch/arm/imx-common $(OBJTREE)/u-boot.imx $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $(OBJTREE)/u-boot.imx
@@ -571,6 +587,27 @@ $(obj)u-boot-img-spl-at-end.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img @@ -571,6 +587,27 @@ $(obj)u-boot-img-spl-at-end.bin: $(obj)s
conv=notrunc 2>/dev/null conv=notrunc 2>/dev/null
cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@ cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@
@ -95,11 +91,9 @@ index 6ee9a3c..73ec67d 100644
ifeq ($(CONFIG_SANDBOX),y) ifeq ($(CONFIG_SANDBOX),y)
GEN_UBOOT = \ GEN_UBOOT = \
cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
diff --git a/README b/README
index 09662a4..1acceff 100644
--- a/README --- a/README
+++ b/README +++ b/README
@@ -468,6 +468,11 @@ The following options need to be configured: @@ -468,6 +468,11 @@ The following options need to be configu
CONF_CM_CACHABLE_CUW CONF_CM_CACHABLE_CUW
CONF_CM_CACHABLE_ACCELERATED CONF_CM_CACHABLE_ACCELERATED
@ -111,11 +105,9 @@ index 09662a4..1acceff 100644
CONFIG_SYS_XWAY_EBU_BOOTCFG CONFIG_SYS_XWAY_EBU_BOOTCFG
Special option for Lantiq XWAY SoCs for booting from NOR flash. Special option for Lantiq XWAY SoCs for booting from NOR flash.
diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index c3f81b5..84b6e59 100644
--- a/arch/mips/config.mk --- a/arch/mips/config.mk
+++ b/arch/mips/config.mk +++ b/arch/mips/config.mk
@@ -45,9 +45,13 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ @@ -45,9 +45,13 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__M
# On the other hand, we want PIC in the U-Boot code to relocate it from ROM # On the other hand, we want PIC in the U-Boot code to relocate it from ROM
# to RAM. $28 is always used as gp. # to RAM. $28 is always used as gp.
# #
@ -131,8 +123,6 @@ index c3f81b5..84b6e59 100644
-LDFLAGS_FINAL += --gc-sections -pie -LDFLAGS_FINAL += --gc-sections -pie
+LDFLAGS_FINAL += --gc-sections $(PF_PIE) +LDFLAGS_FINAL += --gc-sections $(PF_PIE)
OBJCFLAGS += --remove-section=.dynsym OBJCFLAGS += --remove-section=.dynsym
diff --git a/arch/mips/cpu/mips32/cache.S b/arch/mips/cpu/mips32/cache.S
index 12f656c..8620a9d 100644
--- a/arch/mips/cpu/mips32/cache.S --- a/arch/mips/cpu/mips32/cache.S
+++ b/arch/mips/cpu/mips32/cache.S +++ b/arch/mips/cpu/mips32/cache.S
@@ -29,7 +29,11 @@ @@ -29,7 +29,11 @@
@ -171,9 +161,6 @@ index 12f656c..8620a9d 100644
/* clear all tags */ /* clear all tags */
PTR_LI t0, INDEX_BASE PTR_LI t0, INDEX_BASE
PTR_ADDU t1, t0, a1 PTR_ADDU t1, t0, a1
diff --git a/arch/mips/cpu/mips32/danube/Makefile b/arch/mips/cpu/mips32/danube/Makefile
new file mode 100644
index 0000000..98f5f73
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/Makefile +++ b/arch/mips/cpu/mips32/danube/Makefile
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -208,9 +195,6 @@ index 0000000..98f5f73
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/arch/mips/cpu/mips32/danube/cgu.c b/arch/mips/cpu/mips32/danube/cgu.c
new file mode 100644
index 0000000..4fd110a
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/cgu.c +++ b/arch/mips/cpu/mips32/danube/cgu.c
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
@ -331,9 +315,6 @@ index 0000000..4fd110a
+ +
+ return clk; + return clk;
+} +}
diff --git a/arch/mips/cpu/mips32/danube/cgu_init.S b/arch/mips/cpu/mips32/danube/cgu_init.S
new file mode 100644
index 0000000..e0922f1
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/cgu_init.S +++ b/arch/mips/cpu/mips32/danube/cgu_init.S
@@ -0,0 +1,142 @@ @@ -0,0 +1,142 @@
@ -479,9 +460,6 @@ index 0000000..e0922f1
+ jr ra + jr ra
+ +
+ END(ltq_cgu_init) + END(ltq_cgu_init)
diff --git a/arch/mips/cpu/mips32/danube/chipid.c b/arch/mips/cpu/mips32/danube/chipid.c
new file mode 100644
index 0000000..02d9554
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/chipid.c +++ b/arch/mips/cpu/mips32/danube/chipid.c
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -544,9 +522,6 @@ index 0000000..02d9554
+ +
+ return ""; + return "";
+} +}
diff --git a/arch/mips/cpu/mips32/danube/config.mk b/arch/mips/cpu/mips32/danube/config.mk
new file mode 100644
index 0000000..cee376f
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/config.mk +++ b/arch/mips/cpu/mips32/danube/config.mk
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
@ -575,9 +550,6 @@ index 0000000..cee376f
+ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl
+endif +endif
+endif +endif
diff --git a/arch/mips/cpu/mips32/danube/ebu.c b/arch/mips/cpu/mips32/danube/ebu.c
new file mode 100644
index 0000000..902f6a7
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/ebu.c +++ b/arch/mips/cpu/mips32/danube/ebu.c
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
@ -686,9 +658,6 @@ index 0000000..902f6a7
+{ +{
+ return (void *)(addr ^ 2); + return (void *)(addr ^ 2);
+} +}
diff --git a/arch/mips/cpu/mips32/danube/mem.c b/arch/mips/cpu/mips32/danube/mem.c
new file mode 100644
index 0000000..be1922c
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/mem.c +++ b/arch/mips/cpu/mips32/danube/mem.c
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -722,9 +691,6 @@ index 0000000..be1922c
+ +
+ return (1 << (row + col)) * 4 * 2; + return (1 << (row + col)) * 4 * 2;
+} +}
diff --git a/arch/mips/cpu/mips32/danube/mem_init.S b/arch/mips/cpu/mips32/danube/mem_init.S
new file mode 100644
index 0000000..47a35e1
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/mem_init.S +++ b/arch/mips/cpu/mips32/danube/mem_init.S
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
@ -842,9 +808,6 @@ index 0000000..47a35e1
+ jr ra + jr ra
+ +
+ END(ltq_mem_init) + END(ltq_mem_init)
diff --git a/arch/mips/cpu/mips32/danube/pmu.c b/arch/mips/cpu/mips32/danube/pmu.c
new file mode 100644
index 0000000..7dd8aea
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/pmu.c +++ b/arch/mips/cpu/mips32/danube/pmu.c
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
@ -965,9 +928,6 @@ index 0000000..7dd8aea
+ +
+ ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set); + ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set);
+} +}
diff --git a/arch/mips/cpu/mips32/danube/rcu.c b/arch/mips/cpu/mips32/danube/rcu.c
new file mode 100644
index 0000000..906491a
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/danube/rcu.c +++ b/arch/mips/cpu/mips32/danube/rcu.c
@@ -0,0 +1,125 @@ @@ -0,0 +1,125 @@
@ -1096,9 +1056,6 @@ index 0000000..906491a
+ return BOOT_UNKNOWN; + return BOOT_UNKNOWN;
+ } + }
+} +}
diff --git a/arch/mips/cpu/mips32/lantiq-common/Makefile b/arch/mips/cpu/mips32/lantiq-common/Makefile
new file mode 100644
index 0000000..260d67c
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/Makefile +++ b/arch/mips/cpu/mips32/lantiq-common/Makefile
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -1136,9 +1093,6 @@ index 0000000..260d67c
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/arch/mips/cpu/mips32/lantiq-common/cpu.c b/arch/mips/cpu/mips32/lantiq-common/cpu.c
new file mode 100644
index 0000000..4a7acdf
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/cpu.c +++ b/arch/mips/cpu/mips32/lantiq-common/cpu.c
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -1201,9 +1155,6 @@ index 0000000..4a7acdf
+{ +{
+ ltq_reset_activate(LTQ_RESET_CORE); + ltq_reset_activate(LTQ_RESET_CORE);
+} +}
diff --git a/arch/mips/cpu/mips32/lantiq-common/lowlevel_init.S b/arch/mips/cpu/mips32/lantiq-common/lowlevel_init.S
new file mode 100644
index 0000000..ad03b04
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/lowlevel_init.S +++ b/arch/mips/cpu/mips32/lantiq-common/lowlevel_init.S
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
@ -1227,9 +1178,6 @@ index 0000000..ad03b04
+ +
+ jr t8 + jr t8
+ END(lowlevel_init) + END(lowlevel_init)
diff --git a/arch/mips/cpu/mips32/lantiq-common/pmu.c b/arch/mips/cpu/mips32/lantiq-common/pmu.c
new file mode 100644
index 0000000..8f0dac1
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/pmu.c +++ b/arch/mips/cpu/mips32/lantiq-common/pmu.c
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
@ -1242,9 +1190,6 @@ index 0000000..8f0dac1
+#include <common.h> +#include <common.h>
+#include <asm/lantiq/pm.h> +#include <asm/lantiq/pm.h>
+ +
diff --git a/arch/mips/cpu/mips32/lantiq-common/spl.c b/arch/mips/cpu/mips32/lantiq-common/spl.c
new file mode 100644
index 0000000..489a82b
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/spl.c +++ b/arch/mips/cpu/mips32/lantiq-common/spl.c
@@ -0,0 +1,403 @@ @@ -0,0 +1,403 @@
@ -1651,9 +1596,6 @@ index 0000000..489a82b
+ for (;;) + for (;;)
+ ; + ;
+} +}
diff --git a/arch/mips/cpu/mips32/lantiq-common/start.S b/arch/mips/cpu/mips32/lantiq-common/start.S
new file mode 100644
index 0000000..481d739
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/start.S +++ b/arch/mips/cpu/mips32/lantiq-common/start.S
@@ -0,0 +1,143 @@ @@ -0,0 +1,143 @@
@ -1800,9 +1742,6 @@ index 0000000..481d739
+ la t9, spl_lantiq_init + la t9, spl_lantiq_init
+ jr t9 + jr t9
+ nop + nop
diff --git a/arch/mips/cpu/mips32/lantiq-common/u-boot-spl.lds b/arch/mips/cpu/mips32/lantiq-common/u-boot-spl.lds
new file mode 100644
index 0000000..97c8fa8
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/lantiq-common/u-boot-spl.lds +++ b/arch/mips/cpu/mips32/lantiq-common/u-boot-spl.lds
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -1854,8 +1793,6 @@ index 0000000..97c8fa8
+ __end = .; + __end = .;
+ uboot_end = .; + uboot_end = .;
+} +}
diff --git a/arch/mips/cpu/mips32/start.S b/arch/mips/cpu/mips32/start.S
index 70ad198..091a4e2 100644
--- a/arch/mips/cpu/mips32/start.S --- a/arch/mips/cpu/mips32/start.S
+++ b/arch/mips/cpu/mips32/start.S +++ b/arch/mips/cpu/mips32/start.S
@@ -105,7 +105,7 @@ reset: @@ -105,7 +105,7 @@ reset:
@ -1867,9 +1804,6 @@ index 70ad198..091a4e2 100644
/* CONFIG0 register */ /* CONFIG0 register */
li t0, CONF_CM_UNCACHED li t0, CONF_CM_UNCACHED
mtc0 t0, CP0_CONFIG mtc0 t0, CP0_CONFIG
diff --git a/arch/mips/cpu/mips32/vrx200/Makefile b/arch/mips/cpu/mips32/vrx200/Makefile
new file mode 100644
index 0000000..714dc69
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/Makefile +++ b/arch/mips/cpu/mips32/vrx200/Makefile
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
@ -1905,9 +1839,6 @@ index 0000000..714dc69
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/arch/mips/cpu/mips32/vrx200/cgu.c b/arch/mips/cpu/mips32/vrx200/cgu.c
new file mode 100644
index 0000000..799c902
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/cgu.c +++ b/arch/mips/cpu/mips32/vrx200/cgu.c
@@ -0,0 +1,208 @@ @@ -0,0 +1,208 @@
@ -2119,9 +2050,6 @@ index 0000000..799c902
+{ +{
+ ltq_cgu_pll1_init(); + ltq_cgu_pll1_init();
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/cgu_init.S b/arch/mips/cpu/mips32/vrx200/cgu_init.S
new file mode 100644
index 0000000..190ef89
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/cgu_init.S +++ b/arch/mips/cpu/mips32/vrx200/cgu_init.S
@@ -0,0 +1,119 @@ @@ -0,0 +1,119 @@
@ -2244,9 +2172,6 @@ index 0000000..190ef89
+ nop + nop
+ +
+ END(ltq_cgu_init) + END(ltq_cgu_init)
diff --git a/arch/mips/cpu/mips32/vrx200/chipid.c b/arch/mips/cpu/mips32/vrx200/chipid.c
new file mode 100644
index 0000000..f916e87
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/chipid.c +++ b/arch/mips/cpu/mips32/vrx200/chipid.c
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
@ -2312,9 +2237,6 @@ index 0000000..f916e87
+ +
+ return ""; + return "";
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/config.mk b/arch/mips/cpu/mips32/vrx200/config.mk
new file mode 100644
index 0000000..442156a
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/config.mk +++ b/arch/mips/cpu/mips32/vrx200/config.mk
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -2348,9 +2270,6 @@ index 0000000..442156a
+ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl
+endif +endif
+endif +endif
diff --git a/arch/mips/cpu/mips32/vrx200/dcdc.c b/arch/mips/cpu/mips32/vrx200/dcdc.c
new file mode 100644
index 0000000..11ca0d7
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/dcdc.c +++ b/arch/mips/cpu/mips32/vrx200/dcdc.c
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
@ -2460,9 +2379,6 @@ index 0000000..11ca0d7
+ __udelay(1000); + __udelay(1000);
+ } + }
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/ebu.c b/arch/mips/cpu/mips32/vrx200/ebu.c
new file mode 100644
index 0000000..4ab3cf1
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/ebu.c +++ b/arch/mips/cpu/mips32/vrx200/ebu.c
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
@ -2577,25 +2493,6 @@ index 0000000..4ab3cf1
+{ +{
+ return (void *)(addr ^ 2); + return (void *)(addr ^ 2);
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/fw_phy11g_a1x.blob b/arch/mips/cpu/mips32/vrx200/fw_phy11g_a1x.blob
new file mode 100644
index 0000000..cdf3d30
Binary files /dev/null and b/arch/mips/cpu/mips32/vrx200/fw_phy11g_a1x.blob differ
diff --git a/arch/mips/cpu/mips32/vrx200/fw_phy11g_a2x.blob b/arch/mips/cpu/mips32/vrx200/fw_phy11g_a2x.blob
new file mode 100644
index 0000000..1559081
Binary files /dev/null and b/arch/mips/cpu/mips32/vrx200/fw_phy11g_a2x.blob differ
diff --git a/arch/mips/cpu/mips32/vrx200/fw_phy22f_a1x.blob b/arch/mips/cpu/mips32/vrx200/fw_phy22f_a1x.blob
new file mode 100644
index 0000000..02b88a0
Binary files /dev/null and b/arch/mips/cpu/mips32/vrx200/fw_phy22f_a1x.blob differ
diff --git a/arch/mips/cpu/mips32/vrx200/fw_phy22f_a2x.blob b/arch/mips/cpu/mips32/vrx200/fw_phy22f_a2x.blob
new file mode 100644
index 0000000..eeab2ab
Binary files /dev/null and b/arch/mips/cpu/mips32/vrx200/fw_phy22f_a2x.blob differ
diff --git a/arch/mips/cpu/mips32/vrx200/gphy.c b/arch/mips/cpu/mips32/vrx200/gphy.c
new file mode 100644
index 0000000..269ca5d
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/gphy.c +++ b/arch/mips/cpu/mips32/vrx200/gphy.c
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
@ -2657,9 +2554,6 @@ index 0000000..269ca5d
+ ltq_gphy_copy(&__ltq_fw_phy22f_a2x_start, &__ltq_fw_phy22f_a2x_end, + ltq_gphy_copy(&__ltq_fw_phy22f_a2x_start, &__ltq_fw_phy22f_a2x_end,
+ addr); + addr);
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/gphy_fw.S b/arch/mips/cpu/mips32/vrx200/gphy_fw.S
new file mode 100644
index 0000000..3a0417a
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/gphy_fw.S +++ b/arch/mips/cpu/mips32/vrx200/gphy_fw.S
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -2690,9 +2584,6 @@ index 0000000..3a0417a
+EXPORT(__ltq_fw_phy22f_a2x_start) +EXPORT(__ltq_fw_phy22f_a2x_start)
+ .incbin "fw_phy22f_a2x.blob" + .incbin "fw_phy22f_a2x.blob"
+EXPORT(__ltq_fw_phy22f_a2x_end) +EXPORT(__ltq_fw_phy22f_a2x_end)
diff --git a/arch/mips/cpu/mips32/vrx200/mem.c b/arch/mips/cpu/mips32/vrx200/mem.c
new file mode 100644
index 0000000..c3e14ab
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/mem.c +++ b/arch/mips/cpu/mips32/vrx200/mem.c
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
@ -2753,9 +2644,6 @@ index 0000000..c3e14ab
+ +
+ return size; + return size;
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/mem_init.S b/arch/mips/cpu/mips32/vrx200/mem_init.S
new file mode 100644
index 0000000..a296845
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/mem_init.S +++ b/arch/mips/cpu/mips32/vrx200/mem_init.S
@@ -0,0 +1,233 @@ @@ -0,0 +1,233 @@
@ -2992,9 +2880,6 @@ index 0000000..a296845
+ jr ra + jr ra
+ +
+ END(ltq_mem_init) + END(ltq_mem_init)
diff --git a/arch/mips/cpu/mips32/vrx200/pmu.c b/arch/mips/cpu/mips32/vrx200/pmu.c
new file mode 100644
index 0000000..a144473
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/pmu.c +++ b/arch/mips/cpu/mips32/vrx200/pmu.c
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
@ -3128,9 +3013,6 @@ index 0000000..a144473
+ +
+ ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set); + ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set);
+} +}
diff --git a/arch/mips/cpu/mips32/vrx200/rcu.c b/arch/mips/cpu/mips32/vrx200/rcu.c
new file mode 100644
index 0000000..763f287
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/vrx200/rcu.c +++ b/arch/mips/cpu/mips32/vrx200/rcu.c
@@ -0,0 +1,194 @@ @@ -0,0 +1,194 @@
@ -3328,9 +3210,6 @@ index 0000000..763f287
+ /* Start GPHY by releasing reset */ + /* Start GPHY by releasing reset */
+ ltq_clrbits(&ltq_rcu_regs->req, module); + ltq_clrbits(&ltq_rcu_regs->req, module);
+} +}
diff --git a/arch/mips/include/asm/arch-danube/config.h b/arch/mips/include/asm/arch-danube/config.h
new file mode 100644
index 0000000..d84f66f
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-danube/config.h +++ b/arch/mips/include/asm/arch-danube/config.h
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
@ -3497,9 +3376,6 @@ index 0000000..d84f66f
+#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
+ +
+#endif /* __DANUBE_CONFIG_H__ */ +#endif /* __DANUBE_CONFIG_H__ */
diff --git a/arch/mips/include/asm/arch-danube/gpio.h b/arch/mips/include/asm/arch-danube/gpio.h
new file mode 100644
index 0000000..70eb086
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-danube/gpio.h +++ b/arch/mips/include/asm/arch-danube/gpio.h
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -3515,9 +3391,6 @@ index 0000000..70eb086
+#include <asm/lantiq/gpio.h> +#include <asm/lantiq/gpio.h>
+ +
+#endif /* __DANUBE_GPIO_H__ */ +#endif /* __DANUBE_GPIO_H__ */
diff --git a/arch/mips/include/asm/arch-danube/nand.h b/arch/mips/include/asm/arch-danube/nand.h
new file mode 100644
index 0000000..c7a573a
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-danube/nand.h +++ b/arch/mips/include/asm/arch-danube/nand.h
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
@ -3534,9 +3407,6 @@ index 0000000..c7a573a
+int ltq_nand_init(struct nand_chip *nand); +int ltq_nand_init(struct nand_chip *nand);
+ +
+#endif /* __DANUBE_NAND_H__ */ +#endif /* __DANUBE_NAND_H__ */
diff --git a/arch/mips/include/asm/arch-danube/soc.h b/arch/mips/include/asm/arch-danube/soc.h
new file mode 100644
index 0000000..47ef62a
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-danube/soc.h +++ b/arch/mips/include/asm/arch-danube/soc.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
@ -3578,9 +3448,6 @@ index 0000000..47ef62a
+#define LTQ_MC_DDR_DC_OFFSET(x) (x * 0x10) +#define LTQ_MC_DDR_DC_OFFSET(x) (x * 0x10)
+ +
+#endif /* __DANUBE_SOC_H__ */ +#endif /* __DANUBE_SOC_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/config.h b/arch/mips/include/asm/arch-vrx200/config.h
new file mode 100644
index 0000000..88ef256
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/config.h +++ b/arch/mips/include/asm/arch-vrx200/config.h
@@ -0,0 +1,184 @@ @@ -0,0 +1,184 @@
@ -3768,9 +3635,6 @@ index 0000000..88ef256
+#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
+ +
+#endif /* __VRX200_CONFIG_H__ */ +#endif /* __VRX200_CONFIG_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/gphy.h b/arch/mips/include/asm/arch-vrx200/gphy.h
new file mode 100644
index 0000000..6cdb268
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/gphy.h +++ b/arch/mips/include/asm/arch-vrx200/gphy.h
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@ -3839,9 +3703,6 @@ index 0000000..6cdb268
+extern void ltq_rcu_gphy_boot(unsigned int id, ulong addr); +extern void ltq_rcu_gphy_boot(unsigned int id, ulong addr);
+ +
+#endif /* __VRX200_GPHY_H__ */ +#endif /* __VRX200_GPHY_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/gpio.h b/arch/mips/include/asm/arch-vrx200/gpio.h
new file mode 100644
index 0000000..b8d7676
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/gpio.h +++ b/arch/mips/include/asm/arch-vrx200/gpio.h
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -3857,9 +3718,6 @@ index 0000000..b8d7676
+#include <asm/lantiq/gpio.h> +#include <asm/lantiq/gpio.h>
+ +
+#endif /* __VRX200_GPIO_H__ */ +#endif /* __VRX200_GPIO_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/nand.h b/arch/mips/include/asm/arch-vrx200/nand.h
new file mode 100644
index 0000000..231b68f
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/nand.h +++ b/arch/mips/include/asm/arch-vrx200/nand.h
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
@ -3876,9 +3734,6 @@ index 0000000..231b68f
+int ltq_nand_init(struct nand_chip *nand); +int ltq_nand_init(struct nand_chip *nand);
+ +
+#endif /* __VRX200_NAND_H__ */ +#endif /* __VRX200_NAND_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/soc.h b/arch/mips/include/asm/arch-vrx200/soc.h
new file mode 100644
index 0000000..fae5906
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/soc.h +++ b/arch/mips/include/asm/arch-vrx200/soc.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
@ -3927,9 +3782,6 @@ index 0000000..fae5906
+#define LTQ_MC_DDR_CCR_OFFSET(x) (x * 0x10) +#define LTQ_MC_DDR_CCR_OFFSET(x) (x * 0x10)
+ +
+#endif /* __VRX200_SOC_H__ */ +#endif /* __VRX200_SOC_H__ */
diff --git a/arch/mips/include/asm/arch-vrx200/switch.h b/arch/mips/include/asm/arch-vrx200/switch.h
new file mode 100644
index 0000000..e505099
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-vrx200/switch.h +++ b/arch/mips/include/asm/arch-vrx200/switch.h
@@ -0,0 +1,502 @@ @@ -0,0 +1,502 @@
@ -4435,8 +4287,6 @@ index 0000000..e505099
+#define MDIO_CTRL_REGAD_MASK 0x1f +#define MDIO_CTRL_REGAD_MASK 0x1f
+ +
+#endif /* __VRX200_SWITCH_H__ */ +#endif /* __VRX200_SWITCH_H__ */
diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
index 933ccb1..dd0ffb6 100644
--- a/arch/mips/include/asm/asm.h --- a/arch/mips/include/asm/asm.h
+++ b/arch/mips/include/asm/asm.h +++ b/arch/mips/include/asm/asm.h
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
@ -4457,9 +4307,6 @@ index 933ccb1..dd0ffb6 100644
symbol: .frame sp, framesize, rpc symbol: .frame sp, framesize, rpc
/* /*
diff --git a/arch/mips/include/asm/gpio.h b/arch/mips/include/asm/gpio.h
new file mode 100644
index 0000000..9be58b8
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/gpio.h +++ b/arch/mips/include/asm/gpio.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
@ -4469,9 +4316,6 @@ index 0000000..9be58b8
+ +
+#include <asm/arch/gpio.h> +#include <asm/arch/gpio.h>
+#include <asm-generic/gpio.h> +#include <asm-generic/gpio.h>
diff --git a/arch/mips/include/asm/lantiq/chipid.h b/arch/mips/include/asm/lantiq/chipid.h
new file mode 100644
index 0000000..c9921b0
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/chipid.h +++ b/arch/mips/include/asm/lantiq/chipid.h
@@ -0,0 +1,73 @@ @@ -0,0 +1,73 @@
@ -4548,9 +4392,6 @@ index 0000000..c9921b0
+#endif +#endif
+ +
+#endif /* __LANTIQ_CHIPID_H__ */ +#endif /* __LANTIQ_CHIPID_H__ */
diff --git a/arch/mips/include/asm/lantiq/clk.h b/arch/mips/include/asm/lantiq/clk.h
new file mode 100644
index 0000000..e13f000
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/clk.h +++ b/arch/mips/include/asm/lantiq/clk.h
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -4584,9 +4425,6 @@ index 0000000..e13f000
+extern unsigned long ltq_get_io_region_clock(void); +extern unsigned long ltq_get_io_region_clock(void);
+ +
+#endif /* __LANTIQ_CLK_H__ */ +#endif /* __LANTIQ_CLK_H__ */
diff --git a/arch/mips/include/asm/lantiq/config.h b/arch/mips/include/asm/lantiq/config.h
new file mode 100644
index 0000000..feac30d
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/config.h +++ b/arch/mips/include/asm/lantiq/config.h
@@ -0,0 +1,164 @@ @@ -0,0 +1,164 @@
@ -4754,9 +4592,6 @@ index 0000000..feac30d
+ CONFIG_ENV_LOAD_UBOOT_SF + CONFIG_ENV_LOAD_UBOOT_SF
+ +
+#endif /* __LANTIQ_CONFIG_H__ */ +#endif /* __LANTIQ_CONFIG_H__ */
diff --git a/arch/mips/include/asm/lantiq/cpu.h b/arch/mips/include/asm/lantiq/cpu.h
new file mode 100644
index 0000000..b3a504e
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/cpu.h +++ b/arch/mips/include/asm/lantiq/cpu.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -4794,9 +4629,6 @@ index 0000000..b3a504e
+void ltq_dcdc_init(unsigned int dig_ref); +void ltq_dcdc_init(unsigned int dig_ref);
+ +
+#endif /* __LANTIQ_CPU_H__ */ +#endif /* __LANTIQ_CPU_H__ */
diff --git a/arch/mips/include/asm/lantiq/dma.h b/arch/mips/include/asm/lantiq/dma.h
new file mode 100644
index 0000000..15a29c9
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/dma.h +++ b/arch/mips/include/asm/lantiq/dma.h
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
@ -4894,9 +4726,6 @@ index 0000000..15a29c9
+ unsigned long timeout); + unsigned long timeout);
+ +
+#endif /* __LANTIQ_DMA_H__ */ +#endif /* __LANTIQ_DMA_H__ */
diff --git a/arch/mips/include/asm/lantiq/eth.h b/arch/mips/include/asm/lantiq/eth.h
new file mode 100644
index 0000000..d09e9cf
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/eth.h +++ b/arch/mips/include/asm/lantiq/eth.h
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
@ -4935,9 +4764,6 @@ index 0000000..d09e9cf
+extern int ltq_eth_initialize(const struct ltq_eth_board_config *board_config); +extern int ltq_eth_initialize(const struct ltq_eth_board_config *board_config);
+ +
+#endif /* __LANTIQ_ETH_H__ */ +#endif /* __LANTIQ_ETH_H__ */
diff --git a/arch/mips/include/asm/lantiq/gpio.h b/arch/mips/include/asm/lantiq/gpio.h
new file mode 100644
index 0000000..66e227f
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/gpio.h +++ b/arch/mips/include/asm/lantiq/gpio.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
@ -4991,9 +4817,6 @@ index 0000000..66e227f
+#include <asm-generic/gpio.h> +#include <asm-generic/gpio.h>
+ +
+#endif /* __LANTIQ_GPIO_H__ */ +#endif /* __LANTIQ_GPIO_H__ */
diff --git a/arch/mips/include/asm/lantiq/io.h b/arch/mips/include/asm/lantiq/io.h
new file mode 100644
index 0000000..5ac7696
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/io.h +++ b/arch/mips/include/asm/lantiq/io.h
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@ -5034,9 +4857,6 @@ index 0000000..5ac7696
+} +}
+ +
+#endif /* __LANTIQ_IO_H__ */ +#endif /* __LANTIQ_IO_H__ */
diff --git a/arch/mips/include/asm/lantiq/pm.h b/arch/mips/include/asm/lantiq/pm.h
new file mode 100644
index 0000000..9db7117
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/pm.h +++ b/arch/mips/include/asm/lantiq/pm.h
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
@ -5061,9 +4881,6 @@ index 0000000..9db7117
+int ltq_pm_disable(enum ltq_pm_modules module); +int ltq_pm_disable(enum ltq_pm_modules module);
+ +
+#endif /* __LANTIQ_PM_H__ */ +#endif /* __LANTIQ_PM_H__ */
diff --git a/arch/mips/include/asm/lantiq/reset.h b/arch/mips/include/asm/lantiq/reset.h
new file mode 100644
index 0000000..0dbc994
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/lantiq/reset.h +++ b/arch/mips/include/asm/lantiq/reset.h
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@ -5104,8 +4921,6 @@ index 0000000..0dbc994
+} +}
+ +
+#endif /* __LANTIQ_RESET_H__ */ +#endif /* __LANTIQ_RESET_H__ */
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index be7e5c6..b3bc255 100644
--- a/arch/mips/include/asm/mipsregs.h --- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h
@@ -46,7 +46,10 @@ @@ -46,7 +46,10 @@
@ -5170,20 +4985,16 @@ index be7e5c6..b3bc255 100644
* Bits in the coprocessor 0 config register. * Bits in the coprocessor 0 config register.
*/ */
/* Generic bits. */ /* Generic bits. */
diff --git a/arch/mips/include/asm/u-boot-mips.h b/arch/mips/include/asm/u-boot-mips.h
index 9f3cce9..30fb469 100644
--- a/arch/mips/include/asm/u-boot-mips.h --- a/arch/mips/include/asm/u-boot-mips.h
+++ b/arch/mips/include/asm/u-boot-mips.h +++ b/arch/mips/include/asm/u-boot-mips.h
@@ -23,3 +23,4 @@ static inline unsigned long image_copy_end(void) @@ -23,3 +23,4 @@ static inline unsigned long image_copy_e
} }
extern int incaip_set_cpuclk(void); extern int incaip_set_cpuclk(void);
+extern int arch_cpu_init(void); +extern int arch_cpu_init(void);
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 9e6ba15..daa0182 100644
--- a/arch/mips/lib/board.c --- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c
@@ -33,6 +33,16 @@ static char *failed = "*** failed ***\n"; @@ -33,6 +33,16 @@ static char *failed = "*** failed ***\n"
*/ */
const unsigned long mips_io_port_base = -1; const unsigned long mips_io_port_base = -1;
@ -5208,9 +5019,6 @@ index 9e6ba15..daa0182 100644
board_early_init_f, board_early_init_f,
timer_init, timer_init,
env_init, /* initialize environment */ env_init, /* initialize environment */
diff --git a/board/lantiq/easy50712/Makefile b/board/lantiq/easy50712/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy50712/Makefile +++ b/board/lantiq/easy50712/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -5241,9 +5049,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/lantiq/easy50712/config.mk b/board/lantiq/easy50712/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy50712/config.mk +++ b/board/lantiq/easy50712/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -5254,9 +5059,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/lantiq/easy50712/ddr_settings.h b/board/lantiq/easy50712/ddr_settings.h
new file mode 100644
index 0000000..36a4118
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy50712/ddr_settings.h +++ b/board/lantiq/easy50712/ddr_settings.h
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
@ -5314,9 +5116,6 @@ index 0000000..36a4118
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/board/lantiq/easy50712/easy50712.c b/board/lantiq/easy50712/easy50712.c
new file mode 100644
index 0000000..4f6a237
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy50712/easy50712.c +++ b/board/lantiq/easy50712/easy50712.c
@@ -0,0 +1,112 @@ @@ -0,0 +1,112 @@
@ -5432,9 +5231,6 @@ index 0000000..4f6a237
+ break; + break;
+ } + }
+} +}
diff --git a/board/lantiq/easy80920/Makefile b/board/lantiq/easy80920/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy80920/Makefile +++ b/board/lantiq/easy80920/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -5465,9 +5261,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/lantiq/easy80920/config.mk b/board/lantiq/easy80920/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy80920/config.mk +++ b/board/lantiq/easy80920/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -5478,9 +5271,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/lantiq/easy80920/ddr_settings.h b/board/lantiq/easy80920/ddr_settings.h
new file mode 100644
index 0000000..671d1c1
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy80920/ddr_settings.h +++ b/board/lantiq/easy80920/ddr_settings.h
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
@ -5553,9 +5343,6 @@ index 0000000..671d1c1
+#define MC_CCR59_VALUE 0x7800301 +#define MC_CCR59_VALUE 0x7800301
+#define MC_CCR60_VALUE 0x7800301 +#define MC_CCR60_VALUE 0x7800301
+#define MC_CCR61_VALUE 0x4 +#define MC_CCR61_VALUE 0x4
diff --git a/board/lantiq/easy80920/easy80920.c b/board/lantiq/easy80920/easy80920.c
new file mode 100644
index 0000000..d9a4f81
--- /dev/null --- /dev/null
+++ b/board/lantiq/easy80920/easy80920.c +++ b/board/lantiq/easy80920/easy80920.c
@@ -0,0 +1,138 @@ @@ -0,0 +1,138 @@
@ -5697,11 +5484,9 @@ index 0000000..d9a4f81
+ break; + break;
+ } + }
+} +}
diff --git a/boards.cfg b/boards.cfg
index aa2ee64..f090726 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -502,10 +502,17 @@ Active mips mips32 au1x00 - dbau1x00 @@ -502,10 +502,17 @@ Active mips mips32 au1x0
Active mips mips32 au1x00 - dbau1x00 dbau1550 dbau1x00:DBAU1550 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1550 dbau1x00:DBAU1550 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1550_el dbau1x00:DBAU1550,SYS_LITTLE_ENDIAN Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1550_el dbau1x00:DBAU1550,SYS_LITTLE_ENDIAN Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - pb1x00 pb1000 pb1x00:PB1000 - Active mips mips32 au1x00 - pb1x00 pb1000 pb1x00:PB1000 -
@ -5719,8 +5504,6 @@ index aa2ee64..f090726 100644
Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN -
Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN -
Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com> Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com>
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index a6132e2..5a4bcef 100644
--- a/drivers/dma/Makefile --- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile +++ b/drivers/dma/Makefile
@@ -12,6 +12,7 @@ LIB := $(obj)libdma.o @@ -12,6 +12,7 @@ LIB := $(obj)libdma.o
@ -5731,9 +5514,6 @@ index a6132e2..5a4bcef 100644
COBJS-$(CONFIG_OMAP3_DMA) += omap3_dma.o COBJS-$(CONFIG_OMAP3_DMA) += omap3_dma.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
diff --git a/drivers/dma/lantiq_dma.c b/drivers/dma/lantiq_dma.c
new file mode 100644
index 0000000..a78212a
--- /dev/null --- /dev/null
+++ b/drivers/dma/lantiq_dma.c +++ b/drivers/dma/lantiq_dma.c
@@ -0,0 +1,387 @@ @@ -0,0 +1,387 @@
@ -6124,8 +5904,6 @@ index 0000000..a78212a
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 71ddb00..5fb505b 100644
--- a/drivers/gpio/Makefile --- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile
@@ -12,6 +12,7 @@ LIB := $(obj)libgpio.o @@ -12,6 +12,7 @@ LIB := $(obj)libgpio.o
@ -6136,9 +5914,6 @@ index 71ddb00..5fb505b 100644
COBJS-$(CONFIG_MARVELL_GPIO) += mvgpio.o COBJS-$(CONFIG_MARVELL_GPIO) += mvgpio.o
COBJS-$(CONFIG_MARVELL_MFP) += mvmfp.o COBJS-$(CONFIG_MARVELL_MFP) += mvmfp.o
COBJS-$(CONFIG_MXC_GPIO) += mxc_gpio.o COBJS-$(CONFIG_MXC_GPIO) += mxc_gpio.o
diff --git a/drivers/gpio/lantiq_gpio.c b/drivers/gpio/lantiq_gpio.c
new file mode 100644
index 0000000..374a668
--- /dev/null --- /dev/null
+++ b/drivers/gpio/lantiq_gpio.c +++ b/drivers/gpio/lantiq_gpio.c
@@ -0,0 +1,329 @@ @@ -0,0 +1,329 @@
@ -6471,11 +6246,9 @@ index 0000000..374a668
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index a389cd1..fa4fae7 100644
--- a/drivers/mtd/cfi_flash.c --- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c
@@ -161,6 +161,18 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); @@ -161,6 +161,18 @@ u64 flash_read64(void *addr)__attribute_
#define flash_read64 __flash_read64 #define flash_read64 __flash_read64
#endif #endif
@ -6494,7 +6267,7 @@ index a389cd1..fa4fae7 100644
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE) #if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_ADDR_REDUND) || (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
@@ -196,7 +208,7 @@ flash_map (flash_info_t * info, flash_sect_t sect, uint offset) @@ -196,7 +208,7 @@ flash_map (flash_info_t * info, flash_se
{ {
unsigned int byte_offset = offset * info->portwidth; unsigned int byte_offset = offset * info->portwidth;
@ -6503,11 +6276,9 @@ index a389cd1..fa4fae7 100644
} }
static inline void flash_unmap(flash_info_t *info, flash_sect_t sect, static inline void flash_unmap(flash_info_t *info, flash_sect_t sect,
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 366dee6..e9adaaa 100644
--- a/drivers/mtd/nand/Makefile --- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile
@@ -53,6 +53,7 @@ COBJS-$(CONFIG_NAND_JZ4740) += jz4740_nand.o @@ -53,6 +53,7 @@ COBJS-$(CONFIG_NAND_JZ4740) += jz4740_na
COBJS-$(CONFIG_NAND_KB9202) += kb9202_nand.o COBJS-$(CONFIG_NAND_KB9202) += kb9202_nand.o
COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
@ -6515,9 +6286,6 @@ index 366dee6..e9adaaa 100644
COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
COBJS-$(CONFIG_NAND_MXC) += mxc_nand.o COBJS-$(CONFIG_NAND_MXC) += mxc_nand.o
COBJS-$(CONFIG_NAND_MXS) += mxs_nand.o COBJS-$(CONFIG_NAND_MXS) += mxs_nand.o
diff --git a/drivers/mtd/nand/lantiq_nand.c b/drivers/mtd/nand/lantiq_nand.c
new file mode 100644
index 0000000..85f8f68
--- /dev/null --- /dev/null
+++ b/drivers/mtd/nand/lantiq_nand.c +++ b/drivers/mtd/nand/lantiq_nand.c
@@ -0,0 +1,126 @@ @@ -0,0 +1,126 @@
@ -6647,11 +6415,9 @@ index 0000000..85f8f68
+{ +{
+ return ltq_nand_init(chip); + return ltq_nand_init(chip);
+} +}
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 18fd54f..bbc2c92 100644
--- a/drivers/net/Makefile --- a/drivers/net/Makefile
+++ b/drivers/net/Makefile +++ b/drivers/net/Makefile
@@ -37,6 +37,8 @@ COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o @@ -37,6 +37,8 @@ COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-i
COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
COBJS-$(CONFIG_KS8851_MLL) += ks8851_mll.o COBJS-$(CONFIG_KS8851_MLL) += ks8851_mll.o
COBJS-$(CONFIG_LAN91C96) += lan91c96.o COBJS-$(CONFIG_LAN91C96) += lan91c96.o
@ -6660,9 +6426,6 @@ index 18fd54f..bbc2c92 100644
COBJS-$(CONFIG_MACB) += macb.o COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
diff --git a/drivers/net/lantiq_danube_etop.c b/drivers/net/lantiq_danube_etop.c
new file mode 100644
index 0000000..7453882
--- /dev/null --- /dev/null
+++ b/drivers/net/lantiq_danube_etop.c +++ b/drivers/net/lantiq_danube_etop.c
@@ -0,0 +1,410 @@ @@ -0,0 +1,410 @@
@ -7076,9 +6839,6 @@ index 0000000..7453882
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/net/lantiq_vrx200_switch.c b/drivers/net/lantiq_vrx200_switch.c
new file mode 100644
index 0000000..174427d
--- /dev/null --- /dev/null
+++ b/drivers/net/lantiq_vrx200_switch.c +++ b/drivers/net/lantiq_vrx200_switch.c
@@ -0,0 +1,675 @@ @@ -0,0 +1,675 @@
@ -7757,11 +7517,9 @@ index 0000000..174427d
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index fe762e9..9eb08b8 100644
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -20,6 +20,7 @@ COBJS-$(CONFIG_PHY_BROADCOM) += broadcom.o @@ -20,6 +20,7 @@ COBJS-$(CONFIG_PHY_BROADCOM) += broadcom
COBJS-$(CONFIG_PHY_DAVICOM) += davicom.o COBJS-$(CONFIG_PHY_DAVICOM) += davicom.o
COBJS-$(CONFIG_PHY_ET1011C) += et1011c.o COBJS-$(CONFIG_PHY_ET1011C) += et1011c.o
COBJS-$(CONFIG_PHY_ICPLUS) += icplus.o COBJS-$(CONFIG_PHY_ICPLUS) += icplus.o
@ -7769,9 +7527,6 @@ index fe762e9..9eb08b8 100644
COBJS-$(CONFIG_PHY_LXT) += lxt.o COBJS-$(CONFIG_PHY_LXT) += lxt.o
COBJS-$(CONFIG_PHY_MARVELL) += marvell.o COBJS-$(CONFIG_PHY_MARVELL) += marvell.o
COBJS-$(CONFIG_PHY_MICREL) += micrel.o COBJS-$(CONFIG_PHY_MICREL) += micrel.o
diff --git a/drivers/net/phy/lantiq.c b/drivers/net/phy/lantiq.c
new file mode 100644
index 0000000..572c8c3
--- /dev/null --- /dev/null
+++ b/drivers/net/phy/lantiq.c +++ b/drivers/net/phy/lantiq.c
@@ -0,0 +1,238 @@ @@ -0,0 +1,238 @@
@ -8013,8 +7768,6 @@ index 0000000..572c8c3
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 62925bb..dfbe108 100644
--- a/drivers/net/phy/phy.c --- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c
@@ -16,9 +16,10 @@ @@ -16,9 +16,10 @@
@ -8056,11 +7809,9 @@ index 62925bb..dfbe108 100644
#ifdef CONFIG_PHY_LXT #ifdef CONFIG_PHY_LXT
phy_lxt_init(); phy_lxt_init();
#endif #endif
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index e1fd7a5..3247b82 100644
--- a/drivers/serial/Makefile --- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile +++ b/drivers/serial/Makefile
@@ -24,6 +24,7 @@ COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o @@ -24,6 +24,7 @@ COBJS-$(CONFIG_SYS_NS16550_SERIAL) += se
COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o COBJS-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
@ -8068,11 +7819,9 @@ index e1fd7a5..3247b82 100644
COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
COBJS-$(CONFIG_MXC_UART) += serial_mxc.o COBJS-$(CONFIG_MXC_UART) += serial_mxc.o
COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index df2b84a..b955f30 100644
--- a/drivers/serial/serial.c --- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c +++ b/drivers/serial/serial.c
@@ -160,6 +160,7 @@ serial_initfunc(sa1100_serial_initialize); @@ -160,6 +160,7 @@ serial_initfunc(sa1100_serial_initialize
serial_initfunc(sh_serial_initialize); serial_initfunc(sh_serial_initialize);
serial_initfunc(arm_dcc_initialize); serial_initfunc(arm_dcc_initialize);
serial_initfunc(mxs_auart_initialize); serial_initfunc(mxs_auart_initialize);
@ -8088,9 +7837,6 @@ index df2b84a..b955f30 100644
serial_assign(default_serial_console()->name); serial_assign(default_serial_console()->name);
} }
diff --git a/drivers/serial/serial_lantiq.c b/drivers/serial/serial_lantiq.c
new file mode 100644
index 0000000..07b2f9d
--- /dev/null --- /dev/null
+++ b/drivers/serial/serial_lantiq.c +++ b/drivers/serial/serial_lantiq.c
@@ -0,0 +1,263 @@ @@ -0,0 +1,263 @@
@ -8357,11 +8103,9 @@ index 0000000..07b2f9d
+{ +{
+ return &ltq_serial_drv; + return &ltq_serial_drv;
+} +}
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index e5941b0..f831ea1 100644
--- a/drivers/spi/Makefile --- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile +++ b/drivers/spi/Makefile
@@ -25,6 +25,7 @@ COBJS-$(CONFIG_DAVINCI_SPI) += davinci_spi.o @@ -25,6 +25,7 @@ COBJS-$(CONFIG_DAVINCI_SPI) += davinci_s
COBJS-$(CONFIG_EXYNOS_SPI) += exynos_spi.o COBJS-$(CONFIG_EXYNOS_SPI) += exynos_spi.o
COBJS-$(CONFIG_ICH_SPI) += ich.o COBJS-$(CONFIG_ICH_SPI) += ich.o
COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
@ -8369,9 +8113,6 @@ index e5941b0..f831ea1 100644
COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
diff --git a/drivers/spi/lantiq_spi.c b/drivers/spi/lantiq_spi.c
new file mode 100644
index 0000000..b327878
--- /dev/null --- /dev/null
+++ b/drivers/spi/lantiq_spi.c +++ b/drivers/spi/lantiq_spi.c
@@ -0,0 +1,666 @@ @@ -0,0 +1,666 @@
@ -9041,9 +8782,6 @@ index 0000000..b327878
+ +
+ return ret; + return ret;
+} +}
diff --git a/include/configs/easy50712.h b/include/configs/easy50712.h
new file mode 100644
index 0000000..6d7988c
--- /dev/null --- /dev/null
+++ b/include/configs/easy50712.h +++ b/include/configs/easy50712.h
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
@ -9126,9 +8864,6 @@ index 0000000..6d7988c
+ CONFIG_ENV_UPDATE_UBOOT_NOR + CONFIG_ENV_UPDATE_UBOOT_NOR
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
diff --git a/include/configs/easy80920.h b/include/configs/easy80920.h
new file mode 100644
index 0000000..ad69bc2
--- /dev/null --- /dev/null
+++ b/include/configs/easy80920.h +++ b/include/configs/easy80920.h
@@ -0,0 +1,92 @@ @@ -0,0 +1,92 @@
@ -9224,8 +8959,6 @@ index 0000000..ad69bc2
+ CONFIG_ENV_UPDATE_UBOOT_SF + CONFIG_ENV_UPDATE_UBOOT_SF
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
diff --git a/include/phy.h b/include/phy.h
index f0f522a..818bd7f 100644
--- a/include/phy.h --- a/include/phy.h
+++ b/include/phy.h +++ b/include/phy.h
@@ -214,6 +214,7 @@ int phy_atheros_init(void); @@ -214,6 +214,7 @@ int phy_atheros_init(void);
@ -9236,11 +8969,9 @@ index f0f522a..818bd7f 100644
int phy_lxt_init(void); int phy_lxt_init(void);
int phy_marvell_init(void); int phy_marvell_init(void);
int phy_micrel_init(void); int phy_micrel_init(void);
diff --git a/spl/Makefile b/spl/Makefile
index b366ac2..46eb851 100644
--- a/spl/Makefile --- a/spl/Makefile
+++ b/spl/Makefile +++ b/spl/Makefile
@@ -100,6 +100,8 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/libphy.o @@ -100,6 +100,8 @@ LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += dri
LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o
@ -9249,8 +8980,6 @@ index b366ac2..46eb851 100644
ifneq ($(CONFIG_OMAP_COMMON),) ifneq ($(CONFIG_OMAP_COMMON),)
LIBS-y += $(CPUDIR)/omap-common/libomap-common.o LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
diff --git a/tools/.gitignore b/tools/.gitignore
index a7fee26..4d56882 100644
--- a/tools/.gitignore --- a/tools/.gitignore
+++ b/tools/.gitignore +++ b/tools/.gitignore
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
@ -9261,11 +8990,9 @@ index a7fee26..4d56882 100644
/kwboot /kwboot
/mkenvimage /mkenvimage
/mkimage /mkimage
diff --git a/tools/Makefile b/tools/Makefile
index ca76f94..ae1714b 100644
--- a/tools/Makefile --- a/tools/Makefile
+++ b/tools/Makefile +++ b/tools/Makefile
@@ -49,6 +49,7 @@ BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX) @@ -49,6 +49,7 @@ BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_lo
BIN_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX) BIN_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX) BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX) BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
@ -9292,9 +9019,6 @@ index ca76f94..ae1714b 100644
$(obj)xway-swap-bytes$(SFX): $(obj)xway-swap-bytes.o $(obj)xway-swap-bytes$(SFX): $(obj)xway-swap-bytes.o
$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^
$(HOSTSTRIP) $@ $(HOSTSTRIP) $@
diff --git a/tools/ltq-boot-image.c b/tools/ltq-boot-image.c
new file mode 100644
index 0000000..75a188c
--- /dev/null --- /dev/null
+++ b/tools/ltq-boot-image.c +++ b/tools/ltq-boot-image.c
@@ -0,0 +1,315 @@ @@ -0,0 +1,315 @@
@ -9613,6 +9337,3 @@ index 0000000..75a188c
+ +
+ return EXIT_FAILURE; + return EXIT_FAILURE;
+} +}
--
1.8.3.2

View File

@ -7,9 +7,6 @@ Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/arch/mips/cpu/mips32/arx100/Makefile b/arch/mips/cpu/mips32/arx100/Makefile
new file mode 100644
index 0000000..98f5f73
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/Makefile +++ b/arch/mips/cpu/mips32/arx100/Makefile
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -44,9 +41,6 @@ index 0000000..98f5f73
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/arch/mips/cpu/mips32/arx100/cgu.c b/arch/mips/cpu/mips32/arx100/cgu.c
new file mode 100644
index 0000000..6e71ee7
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/cgu.c +++ b/arch/mips/cpu/mips32/arx100/cgu.c
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
@ -159,9 +153,6 @@ index 0000000..6e71ee7
+ +
+ return clk; + return clk;
+} +}
diff --git a/arch/mips/cpu/mips32/arx100/cgu_init.S b/arch/mips/cpu/mips32/arx100/cgu_init.S
new file mode 100644
index 0000000..ed70cb2
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/cgu_init.S +++ b/arch/mips/cpu/mips32/arx100/cgu_init.S
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
@ -270,9 +261,6 @@ index 0000000..ed70cb2
+ nop + nop
+ +
+ END(ltq_cgu_init) + END(ltq_cgu_init)
diff --git a/arch/mips/cpu/mips32/arx100/chipid.c b/arch/mips/cpu/mips32/arx100/chipid.c
new file mode 100644
index 0000000..e97d7ef
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/chipid.c +++ b/arch/mips/cpu/mips32/arx100/chipid.c
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
@ -336,9 +324,6 @@ index 0000000..e97d7ef
+ +
+ return ""; + return "";
+} +}
diff --git a/arch/mips/cpu/mips32/arx100/config.mk b/arch/mips/cpu/mips32/arx100/config.mk
new file mode 100644
index 0000000..442156a
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/config.mk +++ b/arch/mips/cpu/mips32/arx100/config.mk
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -372,9 +357,6 @@ index 0000000..442156a
+ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.norspl
+endif +endif
+endif +endif
diff --git a/arch/mips/cpu/mips32/arx100/ebu.c b/arch/mips/cpu/mips32/arx100/ebu.c
new file mode 100644
index 0000000..4ab3cf1
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/ebu.c +++ b/arch/mips/cpu/mips32/arx100/ebu.c
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
@ -489,9 +471,6 @@ index 0000000..4ab3cf1
+{ +{
+ return (void *)(addr ^ 2); + return (void *)(addr ^ 2);
+} +}
diff --git a/arch/mips/cpu/mips32/arx100/mem.c b/arch/mips/cpu/mips32/arx100/mem.c
new file mode 100644
index 0000000..1fba7cd
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/mem.c +++ b/arch/mips/cpu/mips32/arx100/mem.c
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
@ -525,9 +504,6 @@ index 0000000..1fba7cd
+ +
+ return (1 << (row + col)) * 4 * 2; + return (1 << (row + col)) * 4 * 2;
+} +}
diff --git a/arch/mips/cpu/mips32/arx100/mem_init.S b/arch/mips/cpu/mips32/arx100/mem_init.S
new file mode 100644
index 0000000..5d70842
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/mem_init.S +++ b/arch/mips/cpu/mips32/arx100/mem_init.S
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@
@ -645,9 +621,6 @@ index 0000000..5d70842
+ jr ra + jr ra
+ +
+ END(ltq_mem_init) + END(ltq_mem_init)
diff --git a/arch/mips/cpu/mips32/arx100/pmu.c b/arch/mips/cpu/mips32/arx100/pmu.c
new file mode 100644
index 0000000..d2afe96
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/pmu.c +++ b/arch/mips/cpu/mips32/arx100/pmu.c
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
@ -771,9 +744,6 @@ index 0000000..d2afe96
+ +
+ ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set); + ltq_clrsetbits(&ltq_pmu_regs->pwdcr, clr, set);
+} +}
diff --git a/arch/mips/cpu/mips32/arx100/rcu.c b/arch/mips/cpu/mips32/arx100/rcu.c
new file mode 100644
index 0000000..4ff6935
--- /dev/null --- /dev/null
+++ b/arch/mips/cpu/mips32/arx100/rcu.c +++ b/arch/mips/cpu/mips32/arx100/rcu.c
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
@ -907,11 +877,9 @@ index 0000000..4ff6935
+ return BOOT_UNKNOWN; + return BOOT_UNKNOWN;
+ } + }
+} +}
diff --git a/arch/mips/cpu/mips32/lantiq-common/cpu.c b/arch/mips/cpu/mips32/lantiq-common/cpu.c
index 4a7acdf..aa37b35 100644
--- a/arch/mips/cpu/mips32/lantiq-common/cpu.c --- a/arch/mips/cpu/mips32/lantiq-common/cpu.c
+++ b/arch/mips/cpu/mips32/lantiq-common/cpu.c +++ b/arch/mips/cpu/mips32/lantiq-common/cpu.c
@@ -20,6 +20,7 @@ static const char ltq_bootsel_strings[][16] = { @@ -20,6 +20,7 @@ static const char ltq_bootsel_strings[][
"PCI", "PCI",
"MII0", "MII0",
"RMII0", "RMII0",
@ -919,8 +887,6 @@ index 4a7acdf..aa37b35 100644
"RGMII1", "RGMII1",
"unknown", "unknown",
}; };
diff --git a/arch/mips/cpu/mips32/lantiq-common/start.S b/arch/mips/cpu/mips32/lantiq-common/start.S
index 481d739..fc8276e 100644
--- a/arch/mips/cpu/mips32/lantiq-common/start.S --- a/arch/mips/cpu/mips32/lantiq-common/start.S
+++ b/arch/mips/cpu/mips32/lantiq-common/start.S +++ b/arch/mips/cpu/mips32/lantiq-common/start.S
@@ -64,6 +64,11 @@ @@ -64,6 +64,11 @@
@ -935,9 +901,6 @@ index 481d739..fc8276e 100644
#ifdef CONFIG_SOC_XWAY_VRX200 #ifdef CONFIG_SOC_XWAY_VRX200
#define CONFIG0_LANTIQ (CONFIG0_MIPS34K | CONFIG0_MIPS32_64) #define CONFIG0_LANTIQ (CONFIG0_MIPS34K | CONFIG0_MIPS32_64)
#define STATUS_LANTIQ (STATUS_MIPS34K | STATUS_MIPS32_64) #define STATUS_LANTIQ (STATUS_MIPS34K | STATUS_MIPS32_64)
diff --git a/arch/mips/include/asm/arch-arx100/config.h b/arch/mips/include/asm/arch-arx100/config.h
new file mode 100644
index 0000000..1a6c9bc
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-arx100/config.h +++ b/arch/mips/include/asm/arch-arx100/config.h
@@ -0,0 +1,175 @@ @@ -0,0 +1,175 @@
@ -1116,9 +1079,6 @@ index 0000000..1a6c9bc
+#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
+ +
+#endif /* __ARX100_CONFIG_H__ */ +#endif /* __ARX100_CONFIG_H__ */
diff --git a/arch/mips/include/asm/arch-arx100/gpio.h b/arch/mips/include/asm/arch-arx100/gpio.h
new file mode 100644
index 0000000..f6b6409
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-arx100/gpio.h +++ b/arch/mips/include/asm/arch-arx100/gpio.h
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -1134,9 +1094,6 @@ index 0000000..f6b6409
+#include <asm/lantiq/gpio.h> +#include <asm/lantiq/gpio.h>
+ +
+#endif /* __ARX100_GPIO_H__ */ +#endif /* __ARX100_GPIO_H__ */
diff --git a/arch/mips/include/asm/arch-arx100/nand.h b/arch/mips/include/asm/arch-arx100/nand.h
new file mode 100644
index 0000000..231b68f
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-arx100/nand.h +++ b/arch/mips/include/asm/arch-arx100/nand.h
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
@ -1153,9 +1110,6 @@ index 0000000..231b68f
+int ltq_nand_init(struct nand_chip *nand); +int ltq_nand_init(struct nand_chip *nand);
+ +
+#endif /* __VRX200_NAND_H__ */ +#endif /* __VRX200_NAND_H__ */
diff --git a/arch/mips/include/asm/arch-arx100/soc.h b/arch/mips/include/asm/arch-arx100/soc.h
new file mode 100644
index 0000000..3ccaf3f
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-arx100/soc.h +++ b/arch/mips/include/asm/arch-arx100/soc.h
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@ -1196,8 +1150,6 @@ index 0000000..3ccaf3f
+#define LTQ_MC_DDR_DC_OFFSET(x) (x * 0x10) +#define LTQ_MC_DDR_DC_OFFSET(x) (x * 0x10)
+ +
+#endif /* __ARX100_SOC_H__ */ +#endif /* __ARX100_SOC_H__ */
diff --git a/arch/mips/include/asm/lantiq/chipid.h b/arch/mips/include/asm/lantiq/chipid.h
index c9921b0..19adf97 100644
--- a/arch/mips/include/asm/lantiq/chipid.h --- a/arch/mips/include/asm/lantiq/chipid.h
+++ b/arch/mips/include/asm/lantiq/chipid.h +++ b/arch/mips/include/asm/lantiq/chipid.h
@@ -15,6 +15,10 @@ enum ltq_chip_partnum { @@ -15,6 +15,10 @@ enum ltq_chip_partnum {
@ -1211,10 +1163,12 @@ index c9921b0..19adf97 100644
LTQ_SOC_VRX288 = 0x01C0, /* VRX288 v1.1 */ LTQ_SOC_VRX288 = 0x01C0, /* VRX288 v1.1 */
LTQ_SOC_VRX268 = 0x01C2, /* VRX268 v1.1 */ LTQ_SOC_VRX268 = 0x01C2, /* VRX268 v1.1 */
LTQ_SOC_GRX288 = 0x01C9, /* GRX288 v1.1 */ LTQ_SOC_GRX288 = 0x01C9, /* GRX288 v1.1 */
@@ -38,6 +42,38 @@ static inline int ltq_soc_is_danube(void) @@ -36,6 +40,38 @@ static inline int ltq_soc_is_danube(void
{
return 0;
} }
#endif +#endif
+
+#ifdef CONFIG_SOC_XWAY_ARX100 +#ifdef CONFIG_SOC_XWAY_ARX100
+static inline int ltq_soc_is_arx100(void) +static inline int ltq_soc_is_arx100(void)
+{ +{
@ -1245,13 +1199,9 @@ index c9921b0..19adf97 100644
+{ +{
+ return 0; + return 0;
+} +}
+#endif #endif
+
#ifdef CONFIG_SOC_XWAY_VRX200 #ifdef CONFIG_SOC_XWAY_VRX200
static inline int ltq_soc_is_vrx200(void)
{
diff --git a/arch/mips/include/asm/lantiq/clk.h b/arch/mips/include/asm/lantiq/clk.h
index e13f000..5aea603 100644
--- a/arch/mips/include/asm/lantiq/clk.h --- a/arch/mips/include/asm/lantiq/clk.h
+++ b/arch/mips/include/asm/lantiq/clk.h +++ b/arch/mips/include/asm/lantiq/clk.h
@@ -13,9 +13,10 @@ enum ltq_clk { @@ -13,9 +13,10 @@ enum ltq_clk {
@ -1266,8 +1216,6 @@ index e13f000..5aea603 100644
CLOCK_333_MHZ = 333333333, CLOCK_333_MHZ = 333333333,
CLOCK_393_MHZ = 393219000, CLOCK_393_MHZ = 393219000,
CLOCK_500_MHZ = 500000000, CLOCK_500_MHZ = 500000000,
diff --git a/arch/mips/include/asm/lantiq/cpu.h b/arch/mips/include/asm/lantiq/cpu.h
index b3a504e..e3b0312 100644
--- a/arch/mips/include/asm/lantiq/cpu.h --- a/arch/mips/include/asm/lantiq/cpu.h
+++ b/arch/mips/include/asm/lantiq/cpu.h +++ b/arch/mips/include/asm/lantiq/cpu.h
@@ -17,6 +17,7 @@ enum ltq_boot_select { @@ -17,6 +17,7 @@ enum ltq_boot_select {
@ -1278,6 +1226,3 @@ index b3a504e..e3b0312 100644
BOOT_RGMII1, BOOT_RGMII1,
BOOT_UNKNOWN, BOOT_UNKNOWN,
}; };
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: net: add driver for Lantiq XWAY ARX100 switch
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/arch/mips/include/asm/arch-arx100/config.h b/arch/mips/include/asm/arch-arx100/config.h
index 1a6c9bc..8f955e8 100644
--- a/arch/mips/include/asm/arch-arx100/config.h --- a/arch/mips/include/asm/arch-arx100/config.h
+++ b/arch/mips/include/asm/arch-arx100/config.h +++ b/arch/mips/include/asm/arch-arx100/config.h
@@ -10,17 +10,21 @@ @@ -10,17 +10,21 @@
@ -34,9 +32,6 @@ index 1a6c9bc..8f955e8 100644
*/ */
#ifndef __ARX100_CONFIG_H__ #ifndef __ARX100_CONFIG_H__
diff --git a/arch/mips/include/asm/arch-arx100/switch.h b/arch/mips/include/asm/arch-arx100/switch.h
new file mode 100644
index 0000000..301056c
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/arch-arx100/switch.h +++ b/arch/mips/include/asm/arch-arx100/switch.h
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
@ -126,11 +121,9 @@ index 0000000..301056c
+#define MDIO_CTRL_REGAD_MASK 0x1f +#define MDIO_CTRL_REGAD_MASK 0x1f
+ +
+#endif /* __ARX100_SWITCH_H__ */ +#endif /* __ARX100_SWITCH_H__ */
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index bbc2c92..926b8c2 100644
--- a/drivers/net/Makefile --- a/drivers/net/Makefile
+++ b/drivers/net/Makefile +++ b/drivers/net/Makefile
@@ -38,6 +38,7 @@ COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o @@ -38,6 +38,7 @@ COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks86
COBJS-$(CONFIG_KS8851_MLL) += ks8851_mll.o COBJS-$(CONFIG_KS8851_MLL) += ks8851_mll.o
COBJS-$(CONFIG_LAN91C96) += lan91c96.o COBJS-$(CONFIG_LAN91C96) += lan91c96.o
COBJS-$(CONFIG_LANTIQ_DANUBE_ETOP) += lantiq_danube_etop.o COBJS-$(CONFIG_LANTIQ_DANUBE_ETOP) += lantiq_danube_etop.o
@ -138,9 +131,6 @@ index bbc2c92..926b8c2 100644
COBJS-$(CONFIG_LANTIQ_VRX200_SWITCH) += lantiq_vrx200_switch.o COBJS-$(CONFIG_LANTIQ_VRX200_SWITCH) += lantiq_vrx200_switch.o
COBJS-$(CONFIG_MACB) += macb.o COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
diff --git a/drivers/net/lantiq_arx100_switch.c b/drivers/net/lantiq_arx100_switch.c
new file mode 100644
index 0000000..cc65249
--- /dev/null --- /dev/null
+++ b/drivers/net/lantiq_arx100_switch.c +++ b/drivers/net/lantiq_arx100_switch.c
@@ -0,0 +1,410 @@ @@ -0,0 +1,410 @@
@ -554,6 +544,3 @@ index 0000000..cc65249
+ +
+ return 0; + return 0;
+} +}
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: tools: add some helper tools for Lantiq SoCs
Signed-off-by: Luka Perkov Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/tools/gct.pl b/tools/gct.pl
new file mode 100755
index 0000000..33fa6f7
--- /dev/null --- /dev/null
+++ b/tools/gct.pl +++ b/tools/gct.pl
@@ -0,0 +1,155 @@ @@ -0,0 +1,155 @@
@ -167,9 +164,6 @@ index 0000000..33fa6f7
+ $holder=""; + $holder="";
+ } + }
+} +}
diff --git a/tools/lantiq_bdi_conf.awk b/tools/lantiq_bdi_conf.awk
new file mode 100755
index 0000000..c732289
--- /dev/null --- /dev/null
+++ b/tools/lantiq_bdi_conf.awk +++ b/tools/lantiq_bdi_conf.awk
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
@ -289,9 +283,6 @@ index 0000000..c732289
+ default: + default:
+ } + }
+} +}
diff --git a/tools/lantiq_ram_extract_magic.awk b/tools/lantiq_ram_extract_magic.awk
new file mode 100755
index 0000000..64f1cbc
--- /dev/null --- /dev/null
+++ b/tools/lantiq_ram_extract_magic.awk +++ b/tools/lantiq_ram_extract_magic.awk
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
@ -364,9 +355,6 @@ index 0000000..64f1cbc
+ if ($4 == "t2,736(t1)") + if ($4 == "t2,736(t1)")
+ right_section=0 + right_section=0
+} +}
diff --git a/tools/lantiq_ram_init_uart.awk b/tools/lantiq_ram_init_uart.awk
new file mode 100755
index 0000000..dc82645
--- /dev/null --- /dev/null
+++ b/tools/lantiq_ram_init_uart.awk +++ b/tools/lantiq_ram_init_uart.awk
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
@ -487,6 +475,3 @@ index 0000000..dc82645
+ default: + default:
+ } + }
+} +}
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: tools: lantiq: add NAND SPL support
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/tools/ltq-boot-image.c b/tools/ltq-boot-image.c
index 75a188c..743fc6f 100644
--- a/tools/ltq-boot-image.c --- a/tools/ltq-boot-image.c
+++ b/tools/ltq-boot-image.c +++ b/tools/ltq-boot-image.c
@@ -14,7 +14,8 @@ @@ -14,7 +14,8 @@
@ -42,7 +40,7 @@ index 75a188c..743fc6f 100644
} }
static enum image_types parse_image_type(const char *type) static enum image_types parse_image_type(const char *type)
@@ -64,6 +68,9 @@ static enum image_types parse_image_type(const char *type) @@ -64,6 +68,9 @@ static enum image_types parse_image_type
if (!strncmp(type, "sfspl", 6)) if (!strncmp(type, "sfspl", 6))
return IMAGE_SFSPL; return IMAGE_SFSPL;
@ -52,7 +50,7 @@ index 75a188c..743fc6f 100644
return IMAGE_NONE; return IMAGE_NONE;
} }
@@ -73,7 +80,7 @@ static int parse_args(int argc, char *argv[], struct args *arg) @@ -73,7 +80,7 @@ static int parse_args(int argc, char *ar
memset(arg, 0, sizeof(*arg)); memset(arg, 0, sizeof(*arg));
@ -61,7 +59,7 @@ index 75a188c..743fc6f 100644
switch (opt) { switch (opt) {
case 'h': case 'h':
usage_msg(argv[0]); usage_msg(argv[0]);
@@ -84,6 +91,12 @@ static int parse_args(int argc, char *argv[], struct args *arg) @@ -84,6 +91,12 @@ static int parse_args(int argc, char *ar
case 'e': case 'e':
arg->entry_addr = strtoul(optarg, NULL, 16); arg->entry_addr = strtoul(optarg, NULL, 16);
break; break;
@ -74,7 +72,7 @@ index 75a188c..743fc6f 100644
case 'u': case 'u':
arg->uboot_bin = optarg; arg->uboot_bin = optarg;
break; break;
@@ -114,11 +127,22 @@ static int parse_args(int argc, char *argv[], struct args *arg) @@ -114,11 +127,22 @@ static int parse_args(int argc, char *ar
goto parse_error; goto parse_error;
} }
@ -98,7 +96,7 @@ index 75a188c..743fc6f 100644
return 0; return 0;
parse_error: parse_error:
@@ -174,6 +198,19 @@ static int write_nvb_start_header(int fd, __u32 addr) @@ -174,6 +198,19 @@ static int write_nvb_start_header(int fd
return write_header(fd, hdr, sizeof(hdr)); return write_header(fd, hdr, sizeof(hdr));
} }
@ -118,7 +116,7 @@ index 75a188c..743fc6f 100644
static int open_input_bin(const char *name, void **ptr, size_t *size) static int open_input_bin(const char *name, void **ptr, size_t *size)
{ {
struct stat sbuf; struct stat sbuf;
@@ -238,9 +275,37 @@ static int open_output_bin(const char *name) @@ -238,9 +275,37 @@ static int open_output_bin(const char *n
return fd; return fd;
} }
@ -158,7 +156,7 @@ index 75a188c..743fc6f 100644
void *uboot_ptr, *spl_ptr; void *uboot_ptr, *spl_ptr;
size_t uboot_size, spl_size; size_t uboot_size, spl_size;
@@ -256,9 +321,22 @@ static int create_sfspl(const struct args *arg) @@ -256,9 +321,22 @@ static int create_sfspl(const struct arg
if (0 > uboot_fd) if (0 > uboot_fd)
goto err_uboot; goto err_uboot;
@ -181,7 +179,7 @@ index 75a188c..743fc6f 100644
ret = copy_bin(out_fd, spl_ptr, spl_size); ret = copy_bin(out_fd, spl_ptr, spl_size);
if (ret) if (ret)
@@ -268,16 +346,16 @@ static int create_sfspl(const struct args *arg) @@ -268,16 +346,16 @@ static int create_sfspl(const struct arg
if (ret) if (ret)
goto err_write; goto err_write;
@ -223,6 +221,3 @@ index 75a188c..743fc6f 100644
break; break;
default: default:
fprintf(stderr, "Image type not implemented\n"); fprintf(stderr, "Image type not implemented\n");
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: Makefile: add Lantiq NAND SPL images
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/.gitignore b/.gitignore
index 7abdc37..869b1b8 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -54,6 +54,9 @@ @@ -54,6 +54,9 @@
@ -19,11 +17,9 @@ index 7abdc37..869b1b8 100644
/u-boot.lzma.img /u-boot.lzma.img
/u-boot.lzo.img /u-boot.lzo.img
diff --git a/Makefile b/Makefile
index 73ec67d..0445035 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -599,6 +599,24 @@ $(obj)u-boot.ltq.lzma.sfspl: $(obj)u-boot.lzma.img $(obj)spl/u-boot-spl.bin @@ -599,6 +599,24 @@ $(obj)u-boot.ltq.lzma.sfspl: $(obj)u-boo
$(obj)tools/ltq-boot-image -t sfspl -e $(CONFIG_SPL_TEXT_BASE) \ $(obj)tools/ltq-boot-image -t sfspl -e $(CONFIG_SPL_TEXT_BASE) \
-s $(obj)spl/u-boot-spl.bin -u $< -o $@ -s $(obj)spl/u-boot-spl.bin -u $< -o $@
@ -48,6 +44,3 @@ index 73ec67d..0445035 100644
$(obj)u-boot.ltq.norspl: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin $(obj)u-boot.ltq.norspl: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin
cat $(obj)spl/u-boot-spl.bin $< > $@ cat $(obj)spl/u-boot-spl.bin $< > $@
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: MIPS: lantiq: add NAND SPL support
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/arch/mips/cpu/mips32/lantiq-common/spl.c b/arch/mips/cpu/mips32/lantiq-common/spl.c
index 489a82b..3d9d4d4 100644
--- a/arch/mips/cpu/mips32/lantiq-common/spl.c --- a/arch/mips/cpu/mips32/lantiq-common/spl.c
+++ b/arch/mips/cpu/mips32/lantiq-common/spl.c +++ b/arch/mips/cpu/mips32/lantiq-common/spl.c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@ -36,7 +34,7 @@ index 489a82b..3d9d4d4 100644
#define spl_sync() __asm__ __volatile__("sync"); #define spl_sync() __asm__ __volatile__("sync");
struct spl_image { struct spl_image {
@@ -337,6 +350,58 @@ static int spl_load_nor_flash(struct spl_image *spl) @@ -337,6 +350,58 @@ static int spl_load_nor_flash(struct spl
return ret; return ret;
} }
@ -95,7 +93,7 @@ index 489a82b..3d9d4d4 100644
static int spl_load(struct spl_image *spl) static int spl_load(struct spl_image *spl)
{ {
int ret; int ret;
@@ -345,6 +410,8 @@ static int spl_load(struct spl_image *spl) @@ -345,6 +410,8 @@ static int spl_load(struct spl_image *sp
ret = spl_load_spi_flash(spl); ret = spl_load_spi_flash(spl);
else if (spl_boot_nor_flash) else if (spl_boot_nor_flash)
ret = spl_load_nor_flash(spl); ret = spl_load_nor_flash(spl);
@ -104,8 +102,6 @@ index 489a82b..3d9d4d4 100644
else else
ret = 1; ret = 1;
diff --git a/arch/mips/include/asm/lantiq/config.h b/arch/mips/include/asm/lantiq/config.h
index feac30d..483cc94 100644
--- a/arch/mips/include/asm/lantiq/config.h --- a/arch/mips/include/asm/lantiq/config.h
+++ b/arch/mips/include/asm/lantiq/config.h +++ b/arch/mips/include/asm/lantiq/config.h
@@ -40,6 +40,26 @@ @@ -40,6 +40,26 @@
@ -167,6 +163,3 @@ index feac30d..483cc94 100644
+ CONFIG_ENV_LOAD_UBOOT_NAND + CONFIG_ENV_LOAD_UBOOT_NAND
#endif /* __LANTIQ_CONFIG_H__ */ #endif /* __LANTIQ_CONFIG_H__ */
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: MIPS: vrx200: add NAND SPL support
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/arch/mips/cpu/mips32/vrx200/config.mk b/arch/mips/cpu/mips32/vrx200/config.mk
index 442156a..b0fc882 100644
--- a/arch/mips/cpu/mips32/vrx200/config.mk --- a/arch/mips/cpu/mips32/vrx200/config.mk
+++ b/arch/mips/cpu/mips32/vrx200/config.mk +++ b/arch/mips/cpu/mips32/vrx200/config.mk
@@ -27,4 +27,9 @@ ALL-y += $(obj)u-boot.ltq.norspl @@ -27,4 +27,9 @@ ALL-y += $(obj)u-boot.ltq.norspl
@ -19,8 +17,6 @@ index 442156a..b0fc882 100644
+ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.nandspl +ALL-$(CONFIG_SPL_LZMA_SUPPORT) += $(obj)u-boot.ltq.lzma.nandspl
+endif +endif
endif endif
diff --git a/arch/mips/include/asm/arch-vrx200/config.h b/arch/mips/include/asm/arch-vrx200/config.h
index 88ef256..4ec6092 100644
--- a/arch/mips/include/asm/arch-vrx200/config.h --- a/arch/mips/include/asm/arch-vrx200/config.h
+++ b/arch/mips/include/asm/arch-vrx200/config.h +++ b/arch/mips/include/asm/arch-vrx200/config.h
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
@ -32,6 +28,3 @@ index 88ef256..4ec6092 100644
#define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_TEXT_BASE 0x80100000
#define CONFIG_SPL_TEXT_BASE 0xBE220000 #define CONFIG_SPL_TEXT_BASE 0xBE220000
#endif #endif
--
1.8.3.2

View File

@ -5,11 +5,9 @@ Subject: MIPS: lantiq: easy80920: add support for NAND SPL
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/boards.cfg b/boards.cfg
index f090726..394ede7 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -509,6 +509,7 @@ Active mips mips32 incaip - incaip @@ -509,6 +509,7 @@ Active mips mips32 incai
Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de>
@ -17,8 +15,6 @@ index f090726..394ede7 100644
Active mips mips32 vrx200 lantiq easy80920 easy80920_nor easy80920:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_nor easy80920:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_ram easy80920:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_ram easy80920:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/easy80920.h b/include/configs/easy80920.h
index ad69bc2..56ceedb 100644
--- a/include/configs/easy80920.h --- a/include/configs/easy80920.h
+++ b/include/configs/easy80920.h +++ b/include/configs/easy80920.h
@@ -31,6 +31,14 @@ @@ -31,6 +31,14 @@
@ -63,6 +59,3 @@ index ad69bc2..56ceedb 100644
+ CONFIG_ENV_UPDATE_UBOOT_NAND + CONFIG_ENV_UPDATE_UBOOT_NAND
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: lantiq: add default openwrt config
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/openwrt-lantiq-common.h b/include/configs/openwrt-lantiq-common.h
new file mode 100644
index 0000000..d119bef
--- /dev/null --- /dev/null
+++ b/include/configs/openwrt-lantiq-common.h +++ b/include/configs/openwrt-lantiq-common.h
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
@ -51,6 +48,3 @@ index 0000000..d119bef
+#undef CONFIG_BOOTM_RTEMS +#undef CONFIG_BOOTM_RTEMS
+ +
+#endif /* __OPENWRT_LANTIQ_COMMON_H */ +#endif /* __OPENWRT_LANTIQ_COMMON_H */
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: MIPS: lantiq: easy50712: add openwrt-lantiq-common.h
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/easy50712.h b/include/configs/easy50712.h
index 6d7988c..bc8820a 100644
--- a/include/configs/easy50712.h --- a/include/configs/easy50712.h
+++ b/include/configs/easy50712.h +++ b/include/configs/easy50712.h
@@ -62,13 +62,13 @@ @@ -62,13 +62,13 @@
@ -26,6 +24,3 @@ index 6d7988c..bc8820a 100644
#define CONFIG_ENV_UPDATE_UBOOT_NOR \ #define CONFIG_ENV_UPDATE_UBOOT_NOR \
"update-uboot-nor=run load-uboot-norspl-lzo write-uboot-nor\0" "update-uboot-nor=run load-uboot-norspl-lzo write-uboot-nor\0"
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: MIPS: lantiq: easy80920: add openwrt-lantiq-common.h
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/easy80920.h b/include/configs/easy80920.h
index 56ceedb..6f5ac03 100644
--- a/include/configs/easy80920.h --- a/include/configs/easy80920.h
+++ b/include/configs/easy80920.h +++ b/include/configs/easy80920.h
@@ -84,13 +84,13 @@ @@ -84,13 +84,13 @@
@ -26,6 +24,3 @@ index 56ceedb..6f5ac03 100644
#define CONFIG_ENV_UPDATE_UBOOT_NOR \ #define CONFIG_ENV_UPDATE_UBOOT_NOR \
"update-uboot-nor=run load-uboot-norspl-lzo write-uboot-nor\0" "update-uboot-nor=run load-uboot-norspl-lzo write-uboot-nor\0"
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Arcadyan ARV4519
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/arv4519pw/Makefile b/board/arcadyan/arv4519pw/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv4519pw/Makefile +++ b/board/arcadyan/arv4519pw/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/arv4519pw/arv4519pw.c b/board/arcadyan/arv4519pw/arv4519pw.c
new file mode 100644
index 0000000..a9dfd03
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv4519pw/arv4519pw.c +++ b/board/arcadyan/arv4519pw/arv4519pw.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -96,9 +90,6 @@ index 0000000..a9dfd03
+{ +{
+ return switch_device_register(&ar8216_dev); + return switch_device_register(&ar8216_dev);
+} +}
diff --git a/board/arcadyan/arv4519pw/config.mk b/board/arcadyan/arv4519pw/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv4519pw/config.mk +++ b/board/arcadyan/arv4519pw/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -109,9 +100,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/arv4519pw/ddr_settings.h b/board/arcadyan/arv4519pw/ddr_settings.h
new file mode 100644
index 0000000..c5e88b3
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv4519pw/ddr_settings.h +++ b/board/arcadyan/arv4519pw/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -170,11 +158,9 @@ index 0000000..c5e88b3
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index 394ede7..f300d5a 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -502,6 +502,9 @@ Active mips mips32 au1x00 - dbau1x00 @@ -502,6 +502,9 @@ Active mips mips32 au1x0
Active mips mips32 au1x00 - dbau1x00 dbau1550 dbau1x00:DBAU1550 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1550 dbau1x00:DBAU1550 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1550_el dbau1x00:DBAU1550,SYS_LITTLE_ENDIAN Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1550_el dbau1x00:DBAU1550,SYS_LITTLE_ENDIAN Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - pb1x00 pb1000 pb1x00:PB1000 - Active mips mips32 au1x00 - pb1x00 pb1000 pb1x00:PB1000 -
@ -184,9 +170,6 @@ index 394ede7..f300d5a 100644
Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/arv4519pw.h b/include/configs/arv4519pw.h
new file mode 100644
index 0000000..6907108
--- /dev/null --- /dev/null
+++ b/include/configs/arv4519pw.h +++ b/include/configs/arv4519pw.h
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -257,6 +240,3 @@ index 0000000..6907108
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Arcadyan ARV7518
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/arv7518pw/Makefile b/board/arcadyan/arv7518pw/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7518pw/Makefile +++ b/board/arcadyan/arv7518pw/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/arv7518pw/arv7518pw.c b/board/arcadyan/arv7518pw/arv7518pw.c
new file mode 100644
index 0000000..a9dfd03
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7518pw/arv7518pw.c +++ b/board/arcadyan/arv7518pw/arv7518pw.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -96,9 +90,6 @@ index 0000000..a9dfd03
+{ +{
+ return switch_device_register(&ar8216_dev); + return switch_device_register(&ar8216_dev);
+} +}
diff --git a/board/arcadyan/arv7518pw/config.mk b/board/arcadyan/arv7518pw/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7518pw/config.mk +++ b/board/arcadyan/arv7518pw/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -109,9 +100,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/arv7518pw/ddr_settings.h b/board/arcadyan/arv7518pw/ddr_settings.h
new file mode 100644
index 0000000..8b5e9c5
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7518pw/ddr_settings.h +++ b/board/arcadyan/arv7518pw/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -170,11 +158,9 @@ index 0000000..8b5e9c5
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index f300d5a..e832423 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -505,6 +505,9 @@ Active mips mips32 au1x00 - pb1x00 @@ -505,6 +505,9 @@ Active mips mips32 au1x0
Active mips mips32 danube arcadyan arv4519pw arv4519pw_brn arv4519pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_brn arv4519pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv4519pw arv4519pw_nor arv4519pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_nor arv4519pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv4519pw arv4519pw_ram arv4519pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_ram arv4519pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
@ -184,9 +170,6 @@ index f300d5a..e832423 100644
Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/arv7518pw.h b/include/configs/arv7518pw.h
new file mode 100644
index 0000000..8cf1708
--- /dev/null --- /dev/null
+++ b/include/configs/arv7518pw.h +++ b/include/configs/arv7518pw.h
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -257,6 +240,3 @@ index 0000000..8cf1708
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for AudioCodes MP-252
Signed-off-by: Daniel Golle <dgolle@allnet.de> Signed-off-by: Daniel Golle <dgolle@allnet.de>
diff --git a/board/audiocodes/acmp252/Makefile b/board/audiocodes/acmp252/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/audiocodes/acmp252/Makefile +++ b/board/audiocodes/acmp252/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/audiocodes/acmp252/acmp252.c b/board/audiocodes/acmp252/acmp252.c
new file mode 100644
index 0000000..3368506
--- /dev/null --- /dev/null
+++ b/board/audiocodes/acmp252/acmp252.c +++ b/board/audiocodes/acmp252/acmp252.c
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
@ -110,9 +104,6 @@ index 0000000..3368506
+ +
+ return switch_device_register(&adm6996i_dev); + return switch_device_register(&adm6996i_dev);
+} +}
diff --git a/board/audiocodes/acmp252/config.mk b/board/audiocodes/acmp252/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/audiocodes/acmp252/config.mk +++ b/board/audiocodes/acmp252/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -123,9 +114,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/audiocodes/acmp252/ddr_settings.h b/board/audiocodes/acmp252/ddr_settings.h
new file mode 100644
index 0000000..d0b4f20
--- /dev/null --- /dev/null
+++ b/board/audiocodes/acmp252/ddr_settings.h +++ b/board/audiocodes/acmp252/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -184,11 +172,9 @@ index 0000000..d0b4f20
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index e832423..9f407b8 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -508,6 +508,8 @@ Active mips mips32 danube arcadyan arv4519pw @@ -508,6 +508,8 @@ Active mips mips32 danub
Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
@ -197,9 +183,6 @@ index e832423..9f407b8 100644
Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/acmp252.h b/include/configs/acmp252.h
new file mode 100644
index 0000000..2c9ab19
--- /dev/null --- /dev/null
+++ b/include/configs/acmp252.h +++ b/include/configs/acmp252.h
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
@ -263,6 +246,3 @@ index 0000000..2c9ab19
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for AVM FritzBox 3370
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/avm/fb3370/Makefile b/board/avm/fb3370/Makefile
new file mode 100644
index 0000000..e3d621e
--- /dev/null --- /dev/null
+++ b/board/avm/fb3370/Makefile +++ b/board/avm/fb3370/Makefile
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
@ -39,9 +36,6 @@ index 0000000..e3d621e
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/avm/fb3370/config.mk b/board/avm/fb3370/config.mk
new file mode 100644
index 0000000..4dcfd05
--- /dev/null --- /dev/null
+++ b/board/avm/fb3370/config.mk +++ b/board/avm/fb3370/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -52,9 +46,6 @@ index 0000000..4dcfd05
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/avm/fb3370/ddr_settings.h b/board/avm/fb3370/ddr_settings.h
new file mode 100644
index 0000000..307c084
--- /dev/null --- /dev/null
+++ b/board/avm/fb3370/ddr_settings.h +++ b/board/avm/fb3370/ddr_settings.h
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
@ -127,9 +118,6 @@ index 0000000..307c084
+#define MC_CCR59_VALUE 0x7800301 +#define MC_CCR59_VALUE 0x7800301
+#define MC_CCR60_VALUE 0x7800301 +#define MC_CCR60_VALUE 0x7800301
+#define MC_CCR61_VALUE 0x4 +#define MC_CCR61_VALUE 0x4
diff --git a/board/avm/fb3370/fb3370.c b/board/avm/fb3370/fb3370.c
new file mode 100644
index 0000000..ff44c68
--- /dev/null --- /dev/null
+++ b/board/avm/fb3370/fb3370.c +++ b/board/avm/fb3370/fb3370.c
@@ -0,0 +1,138 @@ @@ -0,0 +1,138 @@
@ -271,11 +259,9 @@ index 0000000..ff44c68
+ break; + break;
+ } + }
+} +}
diff --git a/boards.cfg b/boards.cfg
index 9f407b8..ea5c4f9 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -517,6 +517,9 @@ Active mips mips32 incaip - incaip @@ -517,6 +517,9 @@ Active mips mips32 incai
Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de>
@ -285,9 +271,6 @@ index 9f407b8..ea5c4f9 100644
Active mips mips32 vrx200 lantiq easy80920 easy80920_nandspl easy80920:SYS_BOOT_NANDSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_nandspl easy80920:SYS_BOOT_NANDSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_nor easy80920:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_nor easy80920:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/fb3370.h b/include/configs/fb3370.h
new file mode 100644
index 0000000..8ae1373
--- /dev/null --- /dev/null
+++ b/include/configs/fb3370.h +++ b/include/configs/fb3370.h
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
@ -369,6 +352,3 @@ index 0000000..8ae1373
+ CONFIG_ENV_UPDATE_UBOOT_SF + CONFIG_ENV_UPDATE_UBOOT_SF
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Gigaset SX76X
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/gigaset/sx76x/Makefile b/board/gigaset/sx76x/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/gigaset/sx76x/Makefile +++ b/board/gigaset/sx76x/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/gigaset/sx76x/config.mk b/board/gigaset/sx76x/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/gigaset/sx76x/config.mk +++ b/board/gigaset/sx76x/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -52,9 +46,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/gigaset/sx76x/ddr_settings.h b/board/gigaset/sx76x/ddr_settings.h
new file mode 100644
index 0000000..13cd81b
--- /dev/null --- /dev/null
+++ b/board/gigaset/sx76x/ddr_settings.h +++ b/board/gigaset/sx76x/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -113,9 +104,6 @@ index 0000000..13cd81b
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/board/gigaset/sx76x/sx76x.c b/board/gigaset/sx76x/sx76x.c
new file mode 100644
index 0000000..71996a1
--- /dev/null --- /dev/null
+++ b/board/gigaset/sx76x/sx76x.c +++ b/board/gigaset/sx76x/sx76x.c
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@ -184,11 +172,9 @@ index 0000000..71996a1
+ +
+ return switch_device_register(&adm6996i_dev); + return switch_device_register(&adm6996i_dev);
+} +}
diff --git a/boards.cfg b/boards.cfg
index ea5c4f9..2163cdb 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -510,6 +510,8 @@ Active mips mips32 danube arcadyan arv7518pw @@ -510,6 +510,8 @@ Active mips mips32 danub
Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com>
Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com>
@ -197,9 +183,6 @@ index ea5c4f9..2163cdb 100644
Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_nor easy50712:SYS_BOOT_NOR Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_norspl easy50712:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 danube lantiq easy50712 easy50712_ram easy50712:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/sx76x.h b/include/configs/sx76x.h
new file mode 100644
index 0000000..236851e
--- /dev/null --- /dev/null
+++ b/include/configs/sx76x.h +++ b/include/configs/sx76x.h
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -262,6 +245,3 @@ index 0000000..236851e
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for ZTE ZXHN H367N
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
diff --git a/board/zte/zxhnh367n/Makefile b/board/zte/zxhnh367n/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/zte/zxhnh367n/Makefile +++ b/board/zte/zxhnh367n/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/zte/zxhnh367n/config.mk b/board/zte/zxhnh367n/config.mk
new file mode 100644
index 0000000..9d33739
--- /dev/null --- /dev/null
+++ b/board/zte/zxhnh367n/config.mk +++ b/board/zte/zxhnh367n/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d33739
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/zte/zxhnh367n/ddr_settings.h b/board/zte/zxhnh367n/ddr_settings.h
new file mode 100644
index 0000000..b3f81de
--- /dev/null --- /dev/null
+++ b/board/zte/zxhnh367n/ddr_settings.h +++ b/board/zte/zxhnh367n/ddr_settings.h
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
@ -127,9 +118,6 @@ index 0000000..b3f81de
+#define MC_CCR59_VALUE 0x7800301 +#define MC_CCR59_VALUE 0x7800301
+#define MC_CCR60_VALUE 0x7800301 +#define MC_CCR60_VALUE 0x7800301
+#define MC_CCR61_VALUE 0x4 +#define MC_CCR61_VALUE 0x4
diff --git a/board/zte/zxhnh367n/zxhnh367n.c b/board/zte/zxhnh367n/zxhnh367n.c
new file mode 100644
index 0000000..f64f105
--- /dev/null --- /dev/null
+++ b/board/zte/zxhnh367n/zxhnh367n.c +++ b/board/zte/zxhnh367n/zxhnh367n.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
@ -230,11 +218,9 @@ index 0000000..f64f105
+ +
+ return ltq_eth_initialize(&eth_board_config); + return ltq_eth_initialize(&eth_board_config);
+} +}
diff --git a/boards.cfg b/boards.cfg
index 2163cdb..4b18a26 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -527,6 +527,9 @@ Active mips mips32 vrx200 lantiq easy80920 @@ -527,6 +527,9 @@ Active mips mips32 vrx20
Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_norspl easy80920:SYS_BOOT_NORSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_ram easy80920:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_ram easy80920:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 lantiq easy80920 easy80920_sfspl easy80920:SYS_BOOT_SFSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 lantiq easy80920 easy80920_sfspl easy80920:SYS_BOOT_SFSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
@ -244,9 +230,6 @@ index 2163cdb..4b18a26 100644
Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN -
Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN -
Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com> Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com>
diff --git a/include/configs/zxhnh367n.h b/include/configs/zxhnh367n.h
new file mode 100644
index 0000000..55d2e2a
--- /dev/null --- /dev/null
+++ b/include/configs/zxhnh367n.h +++ b/include/configs/zxhnh367n.h
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
@ -322,6 +305,3 @@ index 0000000..55d2e2a
+ CONFIG_ENV_UPDATE_UBOOT_NAND + CONFIG_ENV_UPDATE_UBOOT_NAND
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for ZTE ZXV10 H201L
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/zte/zxv10h201l/Makefile b/board/zte/zxv10h201l/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/zte/zxv10h201l/Makefile +++ b/board/zte/zxv10h201l/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/zte/zxv10h201l/config.mk b/board/zte/zxv10h201l/config.mk
new file mode 100644
index 0000000..9d33739
--- /dev/null --- /dev/null
+++ b/board/zte/zxv10h201l/config.mk +++ b/board/zte/zxv10h201l/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d33739
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/zte/zxv10h201l/ddr_settings.h b/board/zte/zxv10h201l/ddr_settings.h
new file mode 100644
index 0000000..8814957
--- /dev/null --- /dev/null
+++ b/board/zte/zxv10h201l/ddr_settings.h +++ b/board/zte/zxv10h201l/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -112,9 +103,6 @@ index 0000000..8814957
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x600 +#define MC_DC45_VALUE 0x600
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/board/zte/zxv10h201l/zxv10h201l.c b/board/zte/zxv10h201l/zxv10h201l.c
new file mode 100644
index 0000000..8218a9d
--- /dev/null --- /dev/null
+++ b/board/zte/zxv10h201l/zxv10h201l.c +++ b/board/zte/zxv10h201l/zxv10h201l.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -169,11 +157,9 @@ index 0000000..8218a9d
+{ +{
+ return switch_device_register(&rtl8306_dev); + return switch_device_register(&rtl8306_dev);
+} +}
diff --git a/boards.cfg b/boards.cfg
index 4b18a26..4362856 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -496,6 +496,9 @@ Active mips mips32 - micronas vct @@ -496,6 +496,9 @@ Active mips mips32 -
Active mips mips32 - micronas vct vct_premium_onenand vct:VCT_PREMIUM,VCT_ONENAND - Active mips mips32 - micronas vct vct_premium_onenand vct:VCT_PREMIUM,VCT_ONENAND -
Active mips mips32 - micronas vct vct_premium_onenand_small vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE - Active mips mips32 - micronas vct vct_premium_onenand_small vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE -
Active mips mips32 - micronas vct vct_premium_small vct:VCT_PREMIUM,VCT_SMALL_IMAGE - Active mips mips32 - micronas vct vct_premium_small vct:VCT_PREMIUM,VCT_SMALL_IMAGE -
@ -183,9 +169,6 @@ index 4b18a26..4362856 100644
Active mips mips32 au1x00 - dbau1x00 dbau1000 dbau1x00:DBAU1000 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1000 dbau1x00:DBAU1000 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1100 dbau1x00:DBAU1100 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1100 dbau1x00:DBAU1100 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1500 dbau1x00:DBAU1500 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1500 dbau1x00:DBAU1500 Thomas Lange <thomas@corelatus.se>
diff --git a/include/configs/zxv10h201l.h b/include/configs/zxv10h201l.h
new file mode 100644
index 0000000..bfe116d
--- /dev/null --- /dev/null
+++ b/include/configs/zxv10h201l.h +++ b/include/configs/zxv10h201l.h
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
@ -266,6 +249,3 @@ index 0000000..bfe116d
+ CONFIG_ENV_UPDATE_UBOOT_NOR + CONFIG_ENV_UPDATE_UBOOT_NOR
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for ZyXEL P-661HNU-Fx
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/zyxel/p661hnufx/Makefile b/board/zyxel/p661hnufx/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/zyxel/p661hnufx/Makefile +++ b/board/zyxel/p661hnufx/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/zyxel/p661hnufx/config.mk b/board/zyxel/p661hnufx/config.mk
new file mode 100644
index 0000000..9d33739
--- /dev/null --- /dev/null
+++ b/board/zyxel/p661hnufx/config.mk +++ b/board/zyxel/p661hnufx/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d33739
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/zyxel/p661hnufx/ddr_settings.h b/board/zyxel/p661hnufx/ddr_settings.h
new file mode 100644
index 0000000..83693b8
--- /dev/null --- /dev/null
+++ b/board/zyxel/p661hnufx/ddr_settings.h +++ b/board/zyxel/p661hnufx/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -112,9 +103,6 @@ index 0000000..83693b8
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x600 +#define MC_DC45_VALUE 0x600
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/board/zyxel/p661hnufx/p661hnufx.c b/board/zyxel/p661hnufx/p661hnufx.c
new file mode 100644
index 0000000..dfaca51
--- /dev/null --- /dev/null
+++ b/board/zyxel/p661hnufx/p661hnufx.c +++ b/board/zyxel/p661hnufx/p661hnufx.c
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
@ -220,11 +208,9 @@ index 0000000..dfaca51
+ break; + break;
+ } + }
+} +}
diff --git a/boards.cfg b/boards.cfg
index 4362856..e505203 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -499,6 +499,9 @@ Active mips mips32 - micronas vct @@ -499,6 +499,9 @@ Active mips mips32 -
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_nor zxv10h201l:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_nor zxv10h201l:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_ram zxv10h201l:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_ram zxv10h201l:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_zte zxv10h201l:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_zte zxv10h201l:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org>
@ -234,9 +220,6 @@ index 4362856..e505203 100644
Active mips mips32 au1x00 - dbau1x00 dbau1000 dbau1x00:DBAU1000 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1000 dbau1x00:DBAU1000 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1100 dbau1x00:DBAU1100 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1100 dbau1x00:DBAU1100 Thomas Lange <thomas@corelatus.se>
Active mips mips32 au1x00 - dbau1x00 dbau1500 dbau1x00:DBAU1500 Thomas Lange <thomas@corelatus.se> Active mips mips32 au1x00 - dbau1x00 dbau1500 dbau1x00:DBAU1500 Thomas Lange <thomas@corelatus.se>
diff --git a/include/configs/p661hnufx.h b/include/configs/p661hnufx.h
new file mode 100644
index 0000000..85e3e1e
--- /dev/null --- /dev/null
+++ b/include/configs/p661hnufx.h +++ b/include/configs/p661hnufx.h
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
@ -319,6 +302,3 @@ index 0000000..85e3e1e
+ CONFIG_ENV_UPDATE_UBOOT_SF + CONFIG_ENV_UPDATE_UBOOT_SF
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for ZyXEL P-2601HN-Fx
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
diff --git a/board/zyxel/p2601hnfx/Makefile b/board/zyxel/p2601hnfx/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2601hnfx/Makefile +++ b/board/zyxel/p2601hnfx/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/zyxel/p2601hnfx/config.mk b/board/zyxel/p2601hnfx/config.mk
new file mode 100644
index 0000000..9d33739
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2601hnfx/config.mk +++ b/board/zyxel/p2601hnfx/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d33739
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/zyxel/p2601hnfx/ddr_settings.h b/board/zyxel/p2601hnfx/ddr_settings.h
new file mode 100644
index 0000000..92af4fa
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2601hnfx/ddr_settings.h +++ b/board/zyxel/p2601hnfx/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -112,9 +103,6 @@ index 0000000..92af4fa
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x600 +#define MC_DC45_VALUE 0x600
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/board/zyxel/p2601hnfx/p2601hnfx.c b/board/zyxel/p2601hnfx/p2601hnfx.c
new file mode 100644
index 0000000..6a69af9
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2601hnfx/p2601hnfx.c +++ b/board/zyxel/p2601hnfx/p2601hnfx.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -169,11 +157,9 @@ index 0000000..6a69af9
+{ +{
+ return switch_device_register(&rtl8306_dev); + return switch_device_register(&rtl8306_dev);
+} +}
diff --git a/boards.cfg b/boards.cfg
index e505203..45c2aa0 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -499,6 +499,10 @@ Active mips mips32 - micronas vct @@ -499,6 +499,10 @@ Active mips mips32 -
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_nor zxv10h201l:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_nor zxv10h201l:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_ram zxv10h201l:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_ram zxv10h201l:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zte zxv10h201l zxv10h201l_zte zxv10h201l:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zte zxv10h201l zxv10h201l_zte zxv10h201l:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org>
@ -184,9 +170,6 @@ index e505203..45c2aa0 100644
Active mips mips32 arx100 zyxel p661hnufx p661hnufx_ram p661hnufx:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zyxel p661hnufx p661hnufx_ram p661hnufx:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zyxel p661hnufx p661hnufx_sfspl p661hnufx:SYS_BOOT_SFSPL Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zyxel p661hnufx p661hnufx_sfspl p661hnufx:SYS_BOOT_SFSPL Luka Perkov <luka@openwrt.org>
Active mips mips32 arx100 zyxel p661hnufx p661hnufx_zyxel p661hnufx:SYS_BOOT_ZYXEL Luka Perkov <luka@openwrt.org> Active mips mips32 arx100 zyxel p661hnufx p661hnufx_zyxel p661hnufx:SYS_BOOT_ZYXEL Luka Perkov <luka@openwrt.org>
diff --git a/include/configs/p2601hnfx.h b/include/configs/p2601hnfx.h
new file mode 100644
index 0000000..5cba30f
--- /dev/null --- /dev/null
+++ b/include/configs/p2601hnfx.h +++ b/include/configs/p2601hnfx.h
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -257,6 +240,3 @@ index 0000000..5cba30f
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for ZyXEL P-2812HNU-Fx
Signed-off-by: Luka Perkov <luka@openwrt.org> Signed-off-by: Luka Perkov <luka@openwrt.org>
diff --git a/board/zyxel/p2812hnufx/Makefile b/board/zyxel/p2812hnufx/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2812hnufx/Makefile +++ b/board/zyxel/p2812hnufx/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/zyxel/p2812hnufx/config.mk b/board/zyxel/p2812hnufx/config.mk
new file mode 100644
index 0000000..9d33739
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2812hnufx/config.mk +++ b/board/zyxel/p2812hnufx/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d33739
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/zyxel/p2812hnufx/ddr_settings.h b/board/zyxel/p2812hnufx/ddr_settings.h
new file mode 100644
index 0000000..128c42e
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2812hnufx/ddr_settings.h +++ b/board/zyxel/p2812hnufx/ddr_settings.h
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
@ -127,9 +118,6 @@ index 0000000..128c42e
+#define MC_CCR59_VALUE 0x7800301 +#define MC_CCR59_VALUE 0x7800301
+#define MC_CCR60_VALUE 0x7800301 +#define MC_CCR60_VALUE 0x7800301
+#define MC_CCR61_VALUE 0x4 +#define MC_CCR61_VALUE 0x4
diff --git a/board/zyxel/p2812hnufx/p2812hnufx.c b/board/zyxel/p2812hnufx/p2812hnufx.c
new file mode 100644
index 0000000..cd2f819
--- /dev/null --- /dev/null
+++ b/board/zyxel/p2812hnufx/p2812hnufx.c +++ b/board/zyxel/p2812hnufx/p2812hnufx.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
@ -230,11 +218,9 @@ index 0000000..cd2f819
+ +
+ return ltq_eth_initialize(&eth_board_config); + return ltq_eth_initialize(&eth_board_config);
+} +}
diff --git a/boards.cfg b/boards.cfg
index 45c2aa0..0cbf756 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -540,6 +540,8 @@ Active mips mips32 vrx200 lantiq easy80920 @@ -540,6 +540,8 @@ Active mips mips32 vrx20
Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_nandspl zxhnh367n:SYS_BOOT_NANDSPL Luka Perkov <luka@openwrt.org> Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_nandspl zxhnh367n:SYS_BOOT_NANDSPL Luka Perkov <luka@openwrt.org>
Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_ram zxhnh367n:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_ram zxhnh367n:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_zte zxhnh367n:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org> Active mips mips32 vrx200 zte zxhnh367n zxhnh367n_zte zxhnh367n:SYS_BOOT_ZTE Luka Perkov <luka@openwrt.org>
@ -243,9 +229,6 @@ index 45c2aa0..0cbf756 100644
Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64 qemu-mips64:SYS_BIG_ENDIAN -
Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN - Active mips mips64 - - qemu-mips qemu_mips64el qemu-mips64:SYS_LITTLE_ENDIAN -
Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com> Active nds32 n1213 ag101 AndesTech adp-ag101 adp-ag101 - Andes <uboot@andestech.com>
diff --git a/include/configs/p2812hnufx.h b/include/configs/p2812hnufx.h
new file mode 100644
index 0000000..6806eb1
--- /dev/null --- /dev/null
+++ b/include/configs/p2812hnufx.h +++ b/include/configs/p2812hnufx.h
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -316,6 +299,3 @@ index 0000000..6806eb1
+ CONFIG_ENV_UPDATE_UBOOT_NAND + CONFIG_ENV_UPDATE_UBOOT_NAND
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,9 +5,6 @@ Subject: MIPS: add board support for Arcadyan Easybox 904
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/easybox904/Makefile b/board/arcadyan/easybox904/Makefile
new file mode 100644
index 0000000..0380dea
--- /dev/null --- /dev/null
+++ b/board/arcadyan/easybox904/Makefile +++ b/board/arcadyan/easybox904/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -38,9 +35,6 @@ index 0000000..0380dea
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/easybox904/config.mk b/board/arcadyan/easybox904/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/easybox904/config.mk +++ b/board/arcadyan/easybox904/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -51,9 +45,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/easybox904/ddr_settings.h b/board/arcadyan/easybox904/ddr_settings.h
new file mode 100644
index 0000000..24541bc
--- /dev/null --- /dev/null
+++ b/board/arcadyan/easybox904/ddr_settings.h +++ b/board/arcadyan/easybox904/ddr_settings.h
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
@ -125,9 +116,6 @@ index 0000000..24541bc
+#define MC_CCR59_VALUE 0x7C00301 +#define MC_CCR59_VALUE 0x7C00301
+#define MC_CCR60_VALUE 0x7C00301 +#define MC_CCR60_VALUE 0x7C00301
+#define MC_CCR61_VALUE 0x4 +#define MC_CCR61_VALUE 0x4
diff --git a/board/arcadyan/easybox904/easybox904.c b/board/arcadyan/easybox904/easybox904.c
new file mode 100644
index 0000000..4dbe044
--- /dev/null --- /dev/null
+++ b/board/arcadyan/easybox904/easybox904.c +++ b/board/arcadyan/easybox904/easybox904.c
@@ -0,0 +1,98 @@ @@ -0,0 +1,98 @@
@ -229,11 +217,9 @@ index 0000000..4dbe044
+ +
+ return ltq_eth_initialize(&eth_board_config); + return ltq_eth_initialize(&eth_board_config);
+} +}
diff --git a/boards.cfg b/boards.cfg
index 0cbf756..f10be39 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -529,6 +529,7 @@ Active mips mips32 incaip - incaip @@ -529,6 +529,7 @@ Active mips mips32 incai
Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_100MHz incaip:CPU_CLOCK_RATE=100000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_133MHz incaip:CPU_CLOCK_RATE=133000000 Wolfgang Denk <wd@denx.de>
Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de> Active mips mips32 incaip - incaip incaip_150MHz incaip:CPU_CLOCK_RATE=150000000 Wolfgang Denk <wd@denx.de>
@ -241,9 +227,6 @@ index 0cbf756..f10be39 100644
Active mips mips32 vrx200 avm fb3370 fb3370_eva fb3370:SYS_BOOT_EVA Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 avm fb3370 fb3370_eva fb3370:SYS_BOOT_EVA Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 avm fb3370 fb3370_ram fb3370:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 avm fb3370 fb3370_ram fb3370:SYS_BOOT_RAM Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Active mips mips32 vrx200 avm fb3370 fb3370_sfspl fb3370:SYS_BOOT_SFSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Active mips mips32 vrx200 avm fb3370 fb3370_sfspl fb3370:SYS_BOOT_SFSPL Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/include/configs/easybox904.h b/include/configs/easybox904.h
new file mode 100644
index 0000000..c892d77
--- /dev/null --- /dev/null
+++ b/include/configs/easybox904.h +++ b/include/configs/easybox904.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
@ -292,6 +275,3 @@ index 0000000..c892d77
+ CONFIG_ENV_LANTIQ_DEFAULTS + CONFIG_ENV_LANTIQ_DEFAULTS
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Arcadyan ARV752DPW
Signed-off-by: Oliver Muth <dr.o.muth@gmx.de> Signed-off-by: Oliver Muth <dr.o.muth@gmx.de>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/arv752dpw/Makefile b/board/arcadyan/arv752dpw/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw/Makefile +++ b/board/arcadyan/arv752dpw/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/arv752dpw/arv752dpw.c b/board/arcadyan/arv752dpw/arv752dpw.c
new file mode 100644
index 0000000..d555904
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw/arv752dpw.c +++ b/board/arcadyan/arv752dpw/arv752dpw.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -96,9 +90,6 @@ index 0000000..d555904
+{ +{
+ return switch_device_register(&rtl8306_dev); + return switch_device_register(&rtl8306_dev);
+} +}
diff --git a/board/arcadyan/arv752dpw/config.mk b/board/arcadyan/arv752dpw/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw/config.mk +++ b/board/arcadyan/arv752dpw/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -109,9 +100,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/arv752dpw/ddr_settings.h b/board/arcadyan/arv752dpw/ddr_settings.h
new file mode 100644
index 0000000..a226322
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw/ddr_settings.h +++ b/board/arcadyan/arv752dpw/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -170,11 +158,9 @@ index 0000000..a226322
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index f10be39..79cba2d 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -518,6 +518,9 @@ Active mips mips32 danube arcadyan arv4519pw @@ -518,6 +518,9 @@ Active mips mips32 danub
Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
@ -184,9 +170,6 @@ index f10be39..79cba2d 100644
Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com>
Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com>
Active mips mips32 danube gigaset sx76x gigasx76x_nor sx76x:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube gigaset sx76x gigasx76x_nor sx76x:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
diff --git a/include/configs/arv752dpw.h b/include/configs/arv752dpw.h
new file mode 100644
index 0000000..f6d6092
--- /dev/null --- /dev/null
+++ b/include/configs/arv752dpw.h +++ b/include/configs/arv752dpw.h
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -257,6 +240,3 @@ index 0000000..f6d6092
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Arcadyan ARV752DPW22
Signed-off-by: Oliver Muth <dr.o.muth@gmx.de> Signed-off-by: Oliver Muth <dr.o.muth@gmx.de>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/arv752dpw22/Makefile b/board/arcadyan/arv752dpw22/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw22/Makefile +++ b/board/arcadyan/arv752dpw22/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/arv752dpw22/arv752dpw22.c b/board/arcadyan/arv752dpw22/arv752dpw22.c
new file mode 100644
index 0000000..9b2d89f
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw22/arv752dpw22.c +++ b/board/arcadyan/arv752dpw22/arv752dpw22.c
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
@ -97,9 +91,6 @@ index 0000000..9b2d89f
+{ +{
+ return switch_device_register(&ar8216_dev); + return switch_device_register(&ar8216_dev);
+} +}
diff --git a/board/arcadyan/arv752dpw22/config.mk b/board/arcadyan/arv752dpw22/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw22/config.mk +++ b/board/arcadyan/arv752dpw22/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -110,9 +101,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/arv752dpw22/ddr_settings.h b/board/arcadyan/arv752dpw22/ddr_settings.h
new file mode 100644
index 0000000..a226322
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv752dpw22/ddr_settings.h +++ b/board/arcadyan/arv752dpw22/ddr_settings.h
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
@ -171,11 +159,9 @@ index 0000000..a226322
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index 79cba2d..287f974 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -521,6 +521,9 @@ Active mips mips32 danube arcadyan arv7518pw @@ -521,6 +521,9 @@ Active mips mips32 danub
Active mips mips32 danube arcadyan arv752dpw arv752dpw_brn arv752dpw:SYS_BOOT_BRN - Active mips mips32 danube arcadyan arv752dpw arv752dpw_brn arv752dpw:SYS_BOOT_BRN -
Active mips mips32 danube arcadyan arv752dpw arv752dpw_nor arv752dpw:SYS_BOOT_NOR - Active mips mips32 danube arcadyan arv752dpw arv752dpw_nor arv752dpw:SYS_BOOT_NOR -
Active mips mips32 danube arcadyan arv752dpw arv752dpw_ram arv752dpw:SYS_BOOT_RAM - Active mips mips32 danube arcadyan arv752dpw arv752dpw_ram arv752dpw:SYS_BOOT_RAM -
@ -185,9 +171,6 @@ index 79cba2d..287f974 100644
Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_nor acmp252:SYS_BOOT_NOR Daniel Golle <daniel.golle@gmail.com>
Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com> Active mips mips32 danube audiocodes acmp252 acmp252_ram acmp252:SYS_BOOT_RAM Daniel Golle <daniel.golle@gmail.com>
Active mips mips32 danube gigaset sx76x gigasx76x_nor sx76x:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube gigaset sx76x gigasx76x_nor sx76x:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
diff --git a/include/configs/arv752dpw22.h b/include/configs/arv752dpw22.h
new file mode 100644
index 0000000..f17aa70
--- /dev/null --- /dev/null
+++ b/include/configs/arv752dpw22.h +++ b/include/configs/arv752dpw22.h
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
@ -259,6 +242,3 @@ index 0000000..f17aa70
+ "kernel_addr=0xB0040000\0" + "kernel_addr=0xB0040000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -6,9 +6,6 @@ Subject: MIPS: add board support for Arcadyan ARV7510
Signed-off-by: Matti Laakso <malaakso@elisanet.fi> Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/board/arcadyan/arv7510pw/Makefile b/board/arcadyan/arv7510pw/Makefile
new file mode 100644
index 0000000..3a547c2
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7510pw/Makefile +++ b/board/arcadyan/arv7510pw/Makefile
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -39,9 +36,6 @@ index 0000000..3a547c2
+sinclude $(obj).depend +sinclude $(obj).depend
+ +
+######################################################################### +#########################################################################
diff --git a/board/arcadyan/arv7510pw/arv7510pw.c b/board/arcadyan/arv7510pw/arv7510pw.c
new file mode 100644
index 0000000..6880b4c
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7510pw/arv7510pw.c +++ b/board/arcadyan/arv7510pw/arv7510pw.c
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
@ -117,9 +111,6 @@ index 0000000..6880b4c
+ +
+ return switch_device_register(&adm6996i_dev); + return switch_device_register(&adm6996i_dev);
+} +}
diff --git a/board/arcadyan/arv7510pw/config.mk b/board/arcadyan/arv7510pw/config.mk
new file mode 100644
index 0000000..9d8953b
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7510pw/config.mk +++ b/board/arcadyan/arv7510pw/config.mk
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
@ -130,9 +121,6 @@ index 0000000..9d8953b
+# +#
+ +
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR) +PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/$(BOARDDIR)
diff --git a/board/arcadyan/arv7510pw/ddr_settings.h b/board/arcadyan/arv7510pw/ddr_settings.h
new file mode 100644
index 0000000..e63f591
--- /dev/null --- /dev/null
+++ b/board/arcadyan/arv7510pw/ddr_settings.h +++ b/board/arcadyan/arv7510pw/ddr_settings.h
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
@ -189,11 +177,9 @@ index 0000000..e63f591
+#define MC_DC44_VALUE 0x0 +#define MC_DC44_VALUE 0x0
+#define MC_DC45_VALUE 0x500 +#define MC_DC45_VALUE 0x500
+#define MC_DC46_VALUE 0x0 +#define MC_DC46_VALUE 0x0
diff --git a/boards.cfg b/boards.cfg
index 287f974..29156d4 100644
--- a/boards.cfg --- a/boards.cfg
+++ b/boards.cfg +++ b/boards.cfg
@@ -515,6 +515,9 @@ Active mips mips32 au1x00 - pb1x00 @@ -515,6 +515,9 @@ Active mips mips32 au1x0
Active mips mips32 danube arcadyan arv4519pw arv4519pw_brn arv4519pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_brn arv4519pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv4519pw arv4519pw_nor arv4519pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_nor arv4519pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv4519pw arv4519pw_ram arv4519pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv4519pw arv4519pw_ram arv4519pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
@ -203,9 +189,6 @@ index 287f974..29156d4 100644
Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_brn arv7518pw:SYS_BOOT_BRN Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_nor arv7518pw:SYS_BOOT_NOR Luka Perkov <luka@openwrt.org>
Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org> Active mips mips32 danube arcadyan arv7518pw arv7518pw_ram arv7518pw:SYS_BOOT_RAM Luka Perkov <luka@openwrt.org>
diff --git a/include/configs/arv7510pw.h b/include/configs/arv7510pw.h
new file mode 100644
index 0000000..9eacfa1
--- /dev/null --- /dev/null
+++ b/include/configs/arv7510pw.h +++ b/include/configs/arv7510pw.h
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
@ -284,6 +267,3 @@ index 0000000..9eacfa1
+ "kernel_addr=0xB0060000\0" + "kernel_addr=0xB0060000\0"
+ +
+#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
--
1.8.3.2

View File

@ -5,8 +5,6 @@ Subject: Makefile: prepare u-boot-lantiq-v2013.10-openwrt4
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/Makefile b/Makefile
index 0445035..d5a55f8 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
@ -18,6 +16,3 @@ index 0445035..d5a55f8 100644
ifneq "$(SUBLEVEL)" "" ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else else
--
1.8.3.2