qemu-mips: add CFI support
PATCH 1/1 qemu-mips: add CFI support
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
include/configs/qemu-mips.h +13 -11
@@ -33,7 +33,7 @@#define CONFIG_MISC_INIT_R /*IP address is default used by Qemu*/ -#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ +#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ #define CONFIG_SERVERIP 10.0.2.2/* Server IP address*/ #define CONFIG_BOOTDELAY 10/* autoboot after 10 seconds */
@@ -74,16 +74,12 @@#define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING #define CONFIG_DRIVER_NE2000 #define CONFIG_DRIVER_NE2000_BASE (0xb4000300) -#define CFG_NO_FLASH #define CFG_NS16550 #define CFG_NS16550_SERIAL #define CFG_NS16550_REG_SIZE 1
@@ -140,17 +136,23 @@/* The following #defines are needed to get flash environment right */ #define CFG_MONITOR_BASE TEXT_BASE -#define CFG_MONITOR_LEN (192 << 10) +#define CFG_MONITOR_LEN (192 << 11)#define CFG_INIT_SP_OFFSET 0x400000/* We boot from this flash, selected with dip switch */ #define CFG_FLASH_BASE 0xbfc00000 - -#define CFG_ENV_IS_NOWHERE 1 - +#define CFG_MAX_FLASH_BANKS 1 +#define CFG_MAX_FLASH_SECT 128 +#define CFG_FLASH_CFI 1/* Flash memory is CFI compliant */ +#define CFG_FLASH_CFI_DRIVER 1 +#define CFG_FLASH_USE_BUFFER_WRITE 1 + +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x60000)/* Address and size of Primary Environment Sector */ -#define CFG_ENV_SIZE 0x10000 +#define CFG_ENV_SIZE 0x8000 +#undef CONFIG_NET_MULTI#define MEM_SIZE 128
Signature · 1 line
1.5.4.5
PATCH 1/1 qemu-mips: add CFI support
Hi Jean,
Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>include/configs/qemu-mips.h +1
-1@@ -33,7 +33,7 @@#define CONFIG_MISC_INIT_R /*IP address is default used by Qemu*/ -#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ +#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ #define CONFIG_SERVERIP 10.0.2.2/* Server IP address*/ #define CONFIG_BOOTDELAY 10/* autoboot after 10 seconds */ @@ -74,16 +74,12 @@#define CONFIG_CMD_ELF
include/configs/qemu-mips.h line 80
Quoted 10 lines
include/configs/qemu-mips.h +1
-4#define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING #define CONFIG_DRIVER_NE2000
This patch contains as many fixes as CFI related changes (above). In that case, please add some notes about them or change the subject.
I applied the patch below. If something wrong, please let me know. Or will push in a week or two :-)
Shinya
----------------------------------------------------------------
[MIPS] qemu-mips.h: Update config header
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
- Add CFI support
- Add CONFIG_CMD_PING since qemu-mips has NE2000 driver enabled
- Cleanup whitespaces and remove #undef CMD lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by Shinya Kuribayashi <[email protected]>
---
include/configs/qemu-mips.h | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-)
include/configs/qemu-mips.h +13 -11
@@ -33,7 +33,7 @@#define CONFIG_MISC_INIT_R /*IP address is default used by Qemu*/ -#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ +#define CONFIG_IPADDR 10.0.2.15/* Our IP address */ #define CONFIG_SERVERIP 10.0.2.2/* Server IP address*/ #define CONFIG_BOOTDELAY 10/* autoboot after 10 seconds */
@@ -74,16 +74,12 @@#define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADB -#undef CONFIG_CMD_LOADS#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING #define CONFIG_DRIVER_NE2000 #define CONFIG_DRIVER_NE2000_BASE (0xb4000300) -#define CFG_NO_FLASH #define CFG_NS16550 #define CFG_NS16550_SERIAL #define CFG_NS16550_REG_SIZE 1
@@ -140,17 +136,23 @@/* The following #defines are needed to get flash environment right */ #define CFG_MONITOR_BASE TEXT_BASE -#define CFG_MONITOR_LEN (192 << 10) +#define CFG_MONITOR_LEN (192 << 11)#define CFG_INIT_SP_OFFSET 0x400000/* We boot from this flash, selected with dip switch */ #define CFG_FLASH_BASE 0xbfc00000 - -#define CFG_ENV_IS_NOWHERE 1 - +#define CFG_MAX_FLASH_BANKS 1 +#define CFG_MAX_FLASH_SECT 128 +#define CFG_FLASH_CFI 1/* Flash memory is CFI compliant */ +#define CFG_FLASH_CFI_DRIVER 1 +#define CFG_FLASH_USE_BUFFER_WRITE 1 + +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x60000)/* Address and size of Primary Environment Sector */ -#define CFG_ENV_SIZE 0x10000 +#define CFG_ENV_SIZE 0x8000 +#undef CONFIG_NET_MULTI#define MEM_SIZE 128
PATCH 1/1 qemu-mips: add CFI support
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
...
include/configs/qemu-mips.h line 79
Quoted 7 lines
include/configs/qemu-mips.h +0
-3@@ -74,16 +74,12 @@#define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_LOADB
^^^^^^^^^^^^^^^^^^^^^^^^^^^
include/configs/qemu-mips.h line 80
Quoted 1 line
include/configs/qemu-mips.h +0
-1-#undef CONFIG_CMD_LOADS
^^^^^^^^^^^^^^^^^^^^^^^^^^^
include/configs/qemu-mips.h line 78
Quoted 2 lines
include/configs/qemu-mips.h +1
-0#define CONFIG_CMD_DHCP +#define CONFIG_CMD_PING
^^^^^^^^^^^^^^^^^^^^^^^^^^^
These changes are neither related to CFI support nor mentioned in the subject. This is misleading.
include/configs/qemu-mips.h line 139
Quoted 2 lines
include/configs/qemu-mips.h +1
-1-#define CFG_MONITOR_LEN (192 << 10) +#define CFG_MONITOR_LEN (192 << 11)
It would be much better readable if you wrote "384 << 10" instead - everybody will then see immediately that this is 384 KiB.
But - is this really needed? Has your image become that big? Please check!!
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [email protected] Prepare for tomorrow -- get ready. -- Edith Keeler, "The City On the Edge of Forever", stardate unknown