Initial commit
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,112 @@
|
||||
From 8334494807ff5de7e500cb22e078c08754341c26 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.com>
|
||||
Date: Fri, 25 Oct 2024 10:36:20 +0100
|
||||
Subject: [PATCH 1348/1350] dts: Simplify bootargs
|
||||
|
||||
Reduce the number of different places that bootargs is set in Pi dts
|
||||
files. The variants are all combinations of with/without Bluetooth
|
||||
and with/without NUMA support (2711).
|
||||
|
||||
This is effectively a cosmetic change - the resulting dtbs are
|
||||
unchanged.
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||
---
|
||||
arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi | 4 ++++
|
||||
arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts | 4 ----
|
||||
arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts | 4 ----
|
||||
arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts | 4 ----
|
||||
arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts | 4 ----
|
||||
arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 2 +-
|
||||
arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi | 4 ++++
|
||||
7 files changed, 9 insertions(+), 17 deletions(-)
|
||||
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi
|
||||
@@ -23,6 +23,10 @@
|
||||
};
|
||||
|
||||
/ {
|
||||
+ chosen {
|
||||
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
+ };
|
||||
+
|
||||
aliases {
|
||||
bluetooth = &bt;
|
||||
};
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts
|
||||
@@ -11,10 +11,6 @@
|
||||
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
|
||||
model = "Raspberry Pi Zero W";
|
||||
|
||||
- chosen {
|
||||
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
- };
|
||||
-
|
||||
aliases {
|
||||
serial0 = &uart1;
|
||||
serial1 = &uart0;
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
|
||||
@@ -12,10 +12,6 @@
|
||||
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
|
||||
model = "Raspberry Pi 3 Model B+";
|
||||
|
||||
- chosen {
|
||||
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
- };
|
||||
-
|
||||
aliases {
|
||||
serial0 = &uart1;
|
||||
serial1 = &uart0;
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts
|
||||
@@ -12,10 +12,6 @@
|
||||
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
|
||||
model = "Raspberry Pi 3 Model B";
|
||||
|
||||
- chosen {
|
||||
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
- };
|
||||
-
|
||||
aliases {
|
||||
serial0 = &uart1;
|
||||
serial1 = &uart0;
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
|
||||
@@ -11,10 +11,6 @@
|
||||
compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
|
||||
model = "Raspberry Pi Zero 2 W";
|
||||
|
||||
- chosen {
|
||||
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
- };
|
||||
-
|
||||
aliases {
|
||||
serial0 = &uart1;
|
||||
serial1 = &uart0;
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
||||
@@ -2,7 +2,7 @@
|
||||
#include "bcm270x-rpi.dtsi"
|
||||
|
||||
/ {
|
||||
- chosen: chosen {
|
||||
+ chosen {
|
||||
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 numa_policy=interleave";
|
||||
};
|
||||
|
||||
--- a/arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi
|
||||
+++ b/arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi
|
||||
@@ -23,6 +23,10 @@
|
||||
};
|
||||
|
||||
/ {
|
||||
+ chosen {
|
||||
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
||||
+ };
|
||||
+
|
||||
aliases {
|
||||
bluetooth = &bt;
|
||||
};
|
||||
Reference in New Issue
Block a user