merge rpi fixes: keep default console cmdline params, not root

FyraLabs · Dec 22, 2024 · 08e5b84 · 08e5b84
1 parent 216d1c9
commit 08e5b84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...onfigs-bcm2711_defconfig-no-cmdline.patch → ...s-bcm2711_defconfig-no-cmdline-root.patch b/...onfigs-bcm2711_defconfig-no-cmdline.patch → ...s-bcm2711_defconfig-no-cmdline-root.patch
@@ -7,7 +7,7 @@ index 6411b2d68c56..08bbfb6e9601 100644
  CONFIG_SETEND_EMULATION=y
  CONFIG_RANDOMIZE_BASE=y
 -CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+# CONFIG_CMDLINE is not set
++CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
  # CONFIG_SUSPEND is not set
  CONFIG_PM=y
  CONFIG_PM_DEBUG=y
diff --git a/...onfigs-bcm2712_defconfig-no-cmdline.patch → ...s-bcm2712_defconfig-no-cmdline-root.patch b/...onfigs-bcm2712_defconfig-no-cmdline.patch → ...s-bcm2712_defconfig-no-cmdline-root.patch
@@ -7,7 +7,7 @@ index cf1f73f526c9..3b4e3fc1af38 100644
  CONFIG_SETEND_EMULATION=y
  CONFIG_RANDOMIZE_BASE=y
 -CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+# CONFIG_CMDLINE is not set
++CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
  # CONFIG_SUSPEND is not set
  CONFIG_PM=y
  CONFIG_PM_DEBUG=y