From e0863a7ffc5443fd438d025a19a9c2f2ec9046f4 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 5 Jun 2014 18:44:56 -0700 Subject: [PATCH] libpayload: Renormalize configs The config files need to be renormalized after two new Kconfig options for the IPQ806x have been added. Otherwise, trying to just 'make oldconfig' with them from a command line hangs with extra questions. (I never quite figured out why the ebuild seems to be unaffected by this.) BUG=None TEST=None Change-Id: I272e40ef81e18c4d4e043b053d732c2e1c2599e9 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/202803 Reviewed-by: Vadim Bendebury --- payloads/libpayload/configs/config.bayleybay | 1 + payloads/libpayload/configs/config.beltino | 1 + payloads/libpayload/configs/config.bolt | 1 + payloads/libpayload/configs/config.daisy | 2 ++ payloads/libpayload/configs/config.falco | 1 + payloads/libpayload/configs/config.fox_baskingridge | 1 + payloads/libpayload/configs/config.fox_wtm2 | 1 + payloads/libpayload/configs/config.gizmo | 1 + payloads/libpayload/configs/config.link | 1 + payloads/libpayload/configs/config.lumpy | 1 + payloads/libpayload/configs/config.nyan | 2 ++ payloads/libpayload/configs/config.nyan_big | 2 ++ payloads/libpayload/configs/config.nyan_blaze | 2 ++ payloads/libpayload/configs/config.panther | 1 + payloads/libpayload/configs/config.peach_pit | 2 ++ payloads/libpayload/configs/config.peppy | 1 + payloads/libpayload/configs/config.rambi | 1 + payloads/libpayload/configs/config.samus | 1 + payloads/libpayload/configs/config.slippy | 1 + 19 files changed, 24 insertions(+) diff --git a/payloads/libpayload/configs/config.bayleybay b/payloads/libpayload/configs/config.bayleybay index 9b17153dfd..02f80b9dfb 100644 --- a/payloads/libpayload/configs/config.bayleybay +++ b/payloads/libpayload/configs/config.bayleybay @@ -38,6 +38,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.beltino b/payloads/libpayload/configs/config.beltino index e342b25b67..e3ce6a392f 100644 --- a/payloads/libpayload/configs/config.beltino +++ b/payloads/libpayload/configs/config.beltino @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.bolt b/payloads/libpayload/configs/config.bolt index 1022748531..42dd5cbb45 100644 --- a/payloads/libpayload/configs/config.bolt +++ b/payloads/libpayload/configs/config.bolt @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.daisy b/payloads/libpayload/configs/config.daisy index c3c9fec0f8..95b1a5b3e7 100644 --- a/payloads/libpayload/configs/config.daisy +++ b/payloads/libpayload/configs/config.daisy @@ -36,6 +36,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set CONFIG_LP_S5P_SERIAL_CONSOLE=y # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -50,6 +51,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set CONFIG_LP_TIMER_MCT=y # CONFIG_LP_TIMER_TEGRA_1US is not set +# CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_MCT_HZ=24000000 CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.falco b/payloads/libpayload/configs/config.falco index 1022748531..42dd5cbb45 100644 --- a/payloads/libpayload/configs/config.falco +++ b/payloads/libpayload/configs/config.falco @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.fox_baskingridge b/payloads/libpayload/configs/config.fox_baskingridge index 0ba17336d9..9dd29fe100 100644 --- a/payloads/libpayload/configs/config.fox_baskingridge +++ b/payloads/libpayload/configs/config.fox_baskingridge @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.fox_wtm2 b/payloads/libpayload/configs/config.fox_wtm2 index 1022748531..42dd5cbb45 100644 --- a/payloads/libpayload/configs/config.fox_wtm2 +++ b/payloads/libpayload/configs/config.fox_wtm2 @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.gizmo b/payloads/libpayload/configs/config.gizmo index 282974000b..4baf302bca 100644 --- a/payloads/libpayload/configs/config.gizmo +++ b/payloads/libpayload/configs/config.gizmo @@ -38,6 +38,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.link b/payloads/libpayload/configs/config.link index 0ba17336d9..9dd29fe100 100644 --- a/payloads/libpayload/configs/config.link +++ b/payloads/libpayload/configs/config.link @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.lumpy b/payloads/libpayload/configs/config.lumpy index 0ba17336d9..9dd29fe100 100644 --- a/payloads/libpayload/configs/config.lumpy +++ b/payloads/libpayload/configs/config.lumpy @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.nyan b/payloads/libpayload/configs/config.nyan index 95fe565a87..943f39fe77 100644 --- a/payloads/libpayload/configs/config.nyan +++ b/payloads/libpayload/configs/config.nyan @@ -36,6 +36,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -50,6 +51,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set diff --git a/payloads/libpayload/configs/config.nyan_big b/payloads/libpayload/configs/config.nyan_big index 95fe565a87..943f39fe77 100644 --- a/payloads/libpayload/configs/config.nyan_big +++ b/payloads/libpayload/configs/config.nyan_big @@ -36,6 +36,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -50,6 +51,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set diff --git a/payloads/libpayload/configs/config.nyan_blaze b/payloads/libpayload/configs/config.nyan_blaze index 95fe565a87..943f39fe77 100644 --- a/payloads/libpayload/configs/config.nyan_blaze +++ b/payloads/libpayload/configs/config.nyan_blaze @@ -36,6 +36,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set CONFIG_LP_TEGRA_SERIAL_CONSOLE=y +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -50,6 +51,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set # CONFIG_LP_TIMER_MCT is not set CONFIG_LP_TIMER_TEGRA_1US=y +# CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_TEGRA_1US_ADDRESS=0x60005010 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set diff --git a/payloads/libpayload/configs/config.panther b/payloads/libpayload/configs/config.panther index e342b25b67..e3ce6a392f 100644 --- a/payloads/libpayload/configs/config.panther +++ b/payloads/libpayload/configs/config.panther @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.peach_pit b/payloads/libpayload/configs/config.peach_pit index 07aef385b5..5666721b09 100644 --- a/payloads/libpayload/configs/config.peach_pit +++ b/payloads/libpayload/configs/config.peach_pit @@ -36,6 +36,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set CONFIG_LP_S5P_SERIAL_CONSOLE=y # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -50,6 +51,7 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_NONE is not set CONFIG_LP_TIMER_MCT=y # CONFIG_LP_TIMER_TEGRA_1US is not set +# CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_MCT_HZ=24000000 CONFIG_LP_TIMER_MCT_ADDRESS=0x101c0000 CONFIG_LP_USB=y diff --git a/payloads/libpayload/configs/config.peppy b/payloads/libpayload/configs/config.peppy index 1022748531..42dd5cbb45 100644 --- a/payloads/libpayload/configs/config.peppy +++ b/payloads/libpayload/configs/config.peppy @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.rambi b/payloads/libpayload/configs/config.rambi index d1435a6fc7..a362240e06 100644 --- a/payloads/libpayload/configs/config.rambi +++ b/payloads/libpayload/configs/config.rambi @@ -38,6 +38,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.samus b/payloads/libpayload/configs/config.samus index e342b25b67..e3ce6a392f 100644 --- a/payloads/libpayload/configs/config.samus +++ b/payloads/libpayload/configs/config.samus @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set diff --git a/payloads/libpayload/configs/config.slippy b/payloads/libpayload/configs/config.slippy index 1022748531..42dd5cbb45 100644 --- a/payloads/libpayload/configs/config.slippy +++ b/payloads/libpayload/configs/config.slippy @@ -39,6 +39,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_TEGRA_SERIAL_CONSOLE is not set +# CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set