Browse Source

board/olpc: move MTD symbols up to the common config

XO-1 has an internal MTD device.

Also, CONFIG_MTD_SPI_NOR was set twice for XO-1.75. One copy is removed,
one remains.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Lubomir Rintel 5 years ago
parent
commit
fc2817cfe0
3 changed files with 4 additions and 3 deletions
  1. 2 0
      board/olpc/linux.config
  2. 0 3
      board/olpc/xo-1.75/linux.config
  3. 2 0
      board/olpc/xo-1/linux.config

+ 2 - 0
board/olpc/linux.config

@@ -19,6 +19,8 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
 CONFIG_NETDEVICES=y
 CONFIG_LIBERTAS=m
 CONFIG_INPUT_MOUSEDEV=y

+ 0 - 3
board/olpc/xo-1.75/linux.config

@@ -31,9 +31,6 @@ CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_SPI_NOR=m
 CONFIG_I2C_PXA=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SPI=y

+ 2 - 0
board/olpc/xo-1/linux.config

@@ -22,7 +22,9 @@ CONFIG_CMA=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=0
+CONFIG_MTD_ONENAND=y
 CONFIG_MTD_ONENAND_GENERIC=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_CAFE=y
 CONFIG_MTD_UBI=y
 CONFIG_CS5535_MFGPT=y