diff options
author | Tom Rini <trini@konsulko.com> | 2023-02-12 23:25:09 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-02-12 23:25:09 +0300 |
commit | 386e77cda8b690dbf5b2b7c828b3313205e5078c (patch) | |
tree | 50308d557caee50e8decc77f4be5ddfdeabcc9cb /include | |
parent | 0d91c88230fe8bd9f8d39ca2ab69cd6282e9f949 (diff) | |
parent | 6a8c36b936ab69a7521ec1ecfd20f7b85f7f59c5 (diff) | |
download | u-boot-386e77cda8b690dbf5b2b7c828b3313205e5078c.tar.xz |
Merge branch 'for-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-mpc8xx
- A fix for a long standing bug that has been exposed by commit
50128aeb0f8 ("cyclic: get rid of cyclic_init()") preventing 8xx boards
from booting since u-boot 2023.01
- A GPIO driver for powerpc 8xx chip
- Fixup for powerpc 8xx SPI driver
- A new powerpc 8xx board
- The two devices having that board.
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/MCR3000.h | 83 | ||||
-rw-r--r-- | include/configs/cmpc885.h | 29 | ||||
-rw-r--r-- | include/configs/mcr3000.h | 40 |
3 files changed, 69 insertions, 83 deletions
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h deleted file mode 100644 index c6929c1b98..0000000000 --- a/include/configs/MCR3000.h +++ /dev/null @@ -1,83 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2010-2017 CS Systemes d'Information - * Christophe Leroy <christophe.leroy@c-s.fr> - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* High Level Configuration Options */ - -#define CFG_EXTRA_ENV_SETTINGS \ - "sdram_type=SDRAM\0" \ - "flash_type=AM29LV160DB\0" \ - "loadaddr=0x400000\0" \ - "filename=uImage.lzma\0" \ - "nfsroot=/opt/ofs\0" \ - "dhcp_ip=ip=:::::eth0:dhcp\0" \ - "console_args=console=ttyCPM0,115200N8\0" \ - "flashboot=setenv bootargs " \ - "${console_args} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \ - "mcr3k:eth0:off;" \ - "${ofl_args}; " \ - "bootm 0x04060000 - 0x04050000\0" \ - "tftpboot=setenv bootargs " \ - "${console_args} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \ - "mcr3k:eth0:off " \ - "${ofl_args}; " \ - "tftp ${loadaddr} ${filename};" \ - "tftp 0xf00000 mcr3000.dtb;" \ - "bootm ${loadaddr} - 0xf00000\0" \ - "netboot=dhcp ${loadaddr} ${filename};" \ - "tftp 0xf00000 mcr3000.dtb;" \ - "setenv bootargs " \ - "root=/dev/nfs rw " \ - "${console_args} " \ - "${dhcp_ip};" \ - "bootm ${loadaddr} - 0xf00000\0" \ - "nfsboot=setenv bootargs " \ - "root=/dev/nfs rw nfsroot=${serverip}:${nfsroot} " \ - "${console_args} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \ - "mcr3k:eth0:off;" \ - "bootm 0x04060000 - 0x04050000\0" \ - "dhcpboot=dhcp ${loadaddr} ${filename};" \ - "tftp 0xf00000 mcr3000.dtb;" \ - "setenv bootargs " \ - "${console_args} " \ - "${dhcp_ip} " \ - "${ofl_args}; " \ - "bootm ${loadaddr} - 0xf00000\0" - -/* Miscellaneous configurable options */ - -/* Definitions for initial stack pointer and data area (in DPRAM) */ -#define CFG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800) -#define CFG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800) - -/* RAM configuration (note that CFG_SYS_SDRAM_BASE must be zero) */ -#define CFG_SYS_SDRAM_BASE 0x00000000 - -/* FLASH organization */ -#define CFG_SYS_FLASH_BASE CONFIG_TEXT_BASE - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CFG_SYS_BOOTMAPSZ (8 << 20) - -/* Environment Configuration */ - -/* environment is in FLASH */ - -/* Ethernet configuration part */ - -/* NAND configuration part */ -#define CFG_SYS_NAND_BASE 0x0C000000 - -#endif /* __CONFIG_H */ diff --git a/include/configs/cmpc885.h b/include/configs/cmpc885.h new file mode 100644 index 0000000000..4ce580cd14 --- /dev/null +++ b/include/configs/cmpc885.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2022 CS Group + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* Definitions for initial stack pointer and data area (in DPRAM) */ +#define CFG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800) +#define CFG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800) + +/* RAM configuration (note that CFG_SYS_SDRAM_BASE must be zero) */ +#define CFG_SYS_SDRAM_BASE 0x00000000 + +/* FLASH Configuration */ +#define CFG_SYS_FLASH_BASE 0x40000000 + +/* + * For booting Linux, the board info and command line data + * have to be in the first 24 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CFG_SYS_BOOTMAPSZ (32 << 20) + +/* NAND configuration part */ +#define CFG_SYS_NAND_BASE 0xC0000000 + +#endif /* __CONFIG_H */ diff --git a/include/configs/mcr3000.h b/include/configs/mcr3000.h new file mode 100644 index 0000000000..6b16b050ff --- /dev/null +++ b/include/configs/mcr3000.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2010-2017 CS Systemes d'Information + * Christophe Leroy <christophe.leroy@c-s.fr> + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* High Level Configuration Options */ + +/* Miscellaneous configurable options */ + +/* Definitions for initial stack pointer and data area (in DPRAM) */ +#define CFG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800) +#define CFG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800) + +/* RAM configuration (note that CFG_SYS_SDRAM_BASE must be zero) */ +#define CFG_SYS_SDRAM_BASE 0x00000000 + +/* FLASH organization */ +#define CFG_SYS_FLASH_BASE CONFIG_TEXT_BASE + +/* + * For booting Linux, the board info and command line data + * have to be in the first 32 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CFG_SYS_BOOTMAPSZ (32 << 20) + +/* Environment Configuration */ + +/* environment is in FLASH */ + +/* Ethernet configuration part */ + +/* NAND configuration part */ +#define CFG_SYS_NAND_BASE 0x0C000000 + +#endif /* __CONFIG_H */ |