ARM: rockchip: revert the rk3288 workaround modifyed in commit-22fbc55379c9f8ac29a8...
authorxbw <xbw@rock-chips.com>
Sun, 23 Mar 2014 23:20:28 +0000 (07:20 +0800)
committerxbw <xbw@rock-chips.com>
Sun, 23 Mar 2014 23:24:18 +0000 (07:24 +0800)
    diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index bc3a240..76ddbfd 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -31,7 +31,10 @@ CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
 CONFIG_ARCH_ROCKCHIP=y

arch/arm/configs/rockchip_defconfig

index fc39351b7e2e12c08aa762265d5d4e680719b350..530c0485fa40d10d888d6d0026811b013c8ec67a 100755 (executable)
@@ -34,7 +34,9 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_MSDOS_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
+CONFIG_EFI_PARTITION=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_720789=y