From: Marek Vasut Date: Sun, 7 Jan 2018 19:26:04 +0000 (+0100) Subject: ARM: rmobile: Enable OF_CONTROL on RCar Gen2 X-Git-Tag: v2018.03-rc1~76^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bb834b62470c4c56da51aa50a7c2f7ea8d5e0d95;p=u-boot ARM: rmobile: Enable OF_CONTROL on RCar Gen2 Since the DTs are now in place, enable OF control so that they get bundled into the U-Boot. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 886caac035..489f9493e2 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7794=y CONFIG_TARGET_ALT=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 37822cdeae..3069e0197e 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set @@ -16,6 +17,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 88ef894788..2c0fd0bee5 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index dad4ceb5c2..65e96e69de 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index f1b11cc7b3..e5a6244512 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 65ff3c0a47..1bc748a7aa 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 14f427cd3a..81d449cb98 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7794=y CONFIG_TARGET_SILK=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 9f57c2624e..99574c3134 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y +CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -21,6 +22,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y