Skip to contentSkip to conversation

arm: configs: aspeed_g5_defconfig: Add UBI support

PATCH In review Adriana Kobylak 3 participants 6 messages Feb 7, 2017 – Feb 22, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: configs: aspeed_g5_defconfig: Add UBI support

Add UBI support to aspeed_g5_defocnfig.

---
 arch/arm/configs/aspeed_g5_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/configs/aspeed_g5_defconfig +7 -0
index a5c6ddb..19c37ea 100644
@@ -10,6 +10,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+CONFIG_LZO=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_AIO is not set
@@ -59,7 +60,9 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONED_MASTER=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
 CONFIG_BLK_DEV_RAM=y
@@ -167,3 +170,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_RBTREE=y
Signature · 1 line
1.8.2.2
#1 lore raw
Quoted 4 lines · Adriana Kobylak

Add UBI support to aspeed_g5_defocnfig.

defconfig

And what about aspeed_g4_defconfig?

Quoted 43 lines

---
arch/arm/configs/aspeed_g5_defconfig | 7 +++++++

1 file changed, 7 insertions(+)
arch/arm/configs/aspeed_g5_defconfig +1 -0
index a5c6ddb..19c37ea 100644
@@ -10,6 +10,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+CONFIG_LZO=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_BPF_SYSCALL=y
# CONFIG_AIO is not set

arch/arm/configs/aspeed_g5_defconfig +0 -0
@@ -59,7 +60,9 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DEVICE=y
CONFIG_MTD_PARTITIONED_MASTER=y
+CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_SPI_NOR=y
CONFIG_ASPEED_FLASH_SPI=y
CONFIG_BLK_DEV_RAM=y

arch/arm/configs/aspeed_g5_defconfig +4 -0
@@ -167,3 +170,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_RBTREE=y
Signature · 6 lines
1.8.2.2

_______________________________________________
openbmc mailing list
[email protected]
https://lists.ozlabs.org/listinfo/openbmc
#2 lore raw

Re: [PATCH v2] arm: configs: aspeed: Add UBI support

Add UBI support to aspeed_g4_defconfig and aspeed_g5_defconfig

---
 arch/arm/configs/aspeed_g4_defconfig | 7 +++++++
 arch/arm/configs/aspeed_g5_defconfig | 7 +++++++
 2 files changed, 14 insertions(+)
arch/arm/configs/aspeed_g4_defconfig +7 -0
index 2edad5c..fdc331a 100644
@@ -10,6 +10,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+CONFIG_LZO=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_AIO is not set
@@ -57,7 +58,9 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONED_MASTER=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
 CONFIG_BLK_DEV_RAM=y
@@ -163,3 +166,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_RBTREE=y
arch/arm/configs/aspeed_g5_defconfig +7 -0
index a5c6ddb..19c37ea 100644
@@ -10,6 +10,7 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+CONFIG_LZO=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_AIO is not set
@@ -59,7 +60,9 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONED_MASTER=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
 CONFIG_BLK_DEV_RAM=y
@@ -167,3 +170,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_RBTREE=y
Signature · 1 line
1.8.2.2
maintainer
#3 lore raw

Re: [PATCH v2] arm: configs: aspeed: Add UBI support

arch/arm/configs/aspeed_g4_defconfig CONFIG_DEBUG_SET_MODULE_RONX=y · line 172

Quoted 8 lines · Adriana Kobylak
arch/arm/configs/aspeed_g4_defconfig +4 -0
@@ -163,3 +166,7 @@ CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+CONFIG_RBTREE=y

The symbols CONFIG_CMD_UBI don't exist in the kernel, so something has gone wrong here.

I recommend following these steps to update the defconfigs:

$ make aspeed_g4_defconifg
$ make menuconfig
<enable the options you want>
$ make savedefconfig
$ cp defconfig arch/arm/configs/aspeed_g4_defconfig
$ git add arch/arm/configs/aspeed_g4_defconfig

Repeat for the g5 defconfig, and then do a

$ git commit

Get in touch if you need some help.

Cheers,

Joel

#4 lore raw

Re: [PATCH v3] arm: configs: aspeed: Add UBI support

Add UBI support to aspeed_g4_defconfig and aspeed_g5_defconfig

---
 arch/arm/configs/aspeed_g4_defconfig | 3 +++
 arch/arm/configs/aspeed_g5_defconfig | 3 +++
 2 files changed, 6 insertions(+)
arch/arm/configs/aspeed_g4_defconfig +3 -0
index 2edad5c..4ba778d 100644
@@ -60,6 +60,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_ASPEED_LPC_CTRL=y
 CONFIG_EEPROM_AT24=y
@@ -133,6 +135,7 @@ CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_PRINTK_TIME=y
arch/arm/configs/aspeed_g5_defconfig +3 -0
index a5c6ddb..d02139d 100644
@@ -62,6 +62,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_ASPEED_LPC_CTRL=y
 CONFIG_EEPROM_AT24=y
@@ -136,6 +138,7 @@ CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_PRINTK_TIME=y
Signature · 1 line
1.8.2.2
maintainer
#5 lore raw

Re: [PATCH v3] arm: configs: aspeed: Add UBI support

Quoted 3 lines · Adriana Kobylak

Add UBI support to aspeed_g4_defconfig and aspeed_g5_defconfig

Thanks Adriana. Applied to dev-4.7.

I also enabled CONFIG_MTD_UBI_FASTMAP as I think we want to use this feature.

Cheers,

Joel

Quoted 50 lines
---
 arch/arm/configs/aspeed_g4_defconfig | 3 +++
 arch/arm/configs/aspeed_g5_defconfig | 3 +++
 2 files changed, 6 insertions(+)
arch/arm/configs/aspeed_g4_defconfig +3 -0
index 2edad5c..4ba778d 100644
@@ -60,6 +60,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_ASPEED_LPC_CTRL=y
 CONFIG_EEPROM_AT24=y
@@ -133,6 +135,7 @@ CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_PRINTK_TIME=y
arch/arm/configs/aspeed_g5_defconfig +3 -1
index a5c6ddb..d02139d 100644
@@ -62,6 +62,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_ASPEED_FLASH_SPI=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_ASPEED_LPC_CTRL=y
 CONFIG_EEPROM_AT24=y
@@ -136,6 +138,7 @@ CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_UBIFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_PRINTK_TIME=y
--

1.8.2.2