From 5bc56c9595dfae1c2f4281cd344bf87da4c30bc9 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Thu, 3 Mar 2011 00:28:08 +0100
Subject: [PATCH] linux-kexecboot.inc: add more mangling to protect our custom
 CMDLINE.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes/linux/linux-kexecboot.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc
index e1b10a07a1..87ef03d808 100644
--- a/recipes/linux/linux-kexecboot.inc
+++ b/recipes/linux/linux-kexecboot.inc
@@ -79,9 +79,19 @@ do_configure_prepend() {
 
         echo "" > ${S}/.config
 
+        #
+        # CONFIG_CMDLINE mangling
+        #
         echo "CONFIG_CMDLINE_BOOL=y" >> ${S}/.config
         echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
+        # mips and x86
+        echo "CONFIG_CMDLINE_OVERRIDE=y" >> ${S}/.config
+
+        # sh only
+        echo "CONFIG_CMDLINE_OVERWRITE=y" >> ${S}/.config
+        echo "# CONFIG_CMDLINE_EXTEND is not set" >> ${S}/.config
+
         #
         # endian support
         #
@@ -105,6 +115,10 @@ do_configure_prepend() {
         fi
 
         sed -e '/CONFIG_CMDLINE=/d' \
+            -e '/CONFIG_CMDLINE_BOOL/d' \
+            -e '/CONFIG_CMDLINE_OVERRIDE/d' \
+            -e '/CONFIG_CMDLINE_OVERWRITE/d' \
+            -e '/CONFIG_CMDLINE_EXTEND/d' \
             -e '/CONFIG_CPU_BIG_ENDIAN/d' \
             -e '/CONFIG_LOGO=/d' \
             -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
-- 
2.39.5