diff options
| author | Andrei Gherzan <andrei@gherzan.com> | 2017-05-17 18:48:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 18:48:50 +0100 |
| commit | c4e6ff4f9fd12eddfd1268c4edbdfebef4849165 (patch) | |
| tree | a069c73aea2c60014666251f1d797bc73b5415e5 | |
| parent | 39e1d49097ba9c3193b222c23fc9db6871f74333 (diff) | |
| parent | e28e6e64224accf762887a597f5485af5bb12268 (diff) | |
| download | meta-raspberrypi-c4e6ff4f9fd12eddfd1268c4edbdfebef4849165.tar.gz | |
Merge pull request #59 from LocutusOfBorg/patch-2
Make CMDLINE overridable from outside
| -rw-r--r-- | conf/machine/raspberrypi0.conf | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-raspberrypi.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf index 7c2b811..3bd9e95 100644 --- a/conf/machine/raspberrypi0.conf +++ b/conf/machine/raspberrypi0.conf | |||
| @@ -5,5 +5,5 @@ | |||
| 5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" | 5 | MACHINEOVERRIDES = "raspberrypi:${MACHINE}" |
| 6 | include conf/machine/raspberrypi.conf | 6 | include conf/machine/raspberrypi.conf |
| 7 | 7 | ||
| 8 | SERIAL_CONSOLE = "115200 ttyAMA0" | 8 | SERIAL_CONSOLE ?= "115200 ttyAMA0" |
| 9 | VC4_CMA_SIZE ?= "cma-128" | 9 | VC4_CMA_SIZE ?= "cma-128" |
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index cf61cce..9265d55 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc | |||
| @@ -21,7 +21,7 @@ KERNEL_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" | |||
| 21 | KERNEL_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" | 21 | KERNEL_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" |
| 22 | 22 | ||
| 23 | # CMDLINE for raspberrypi | 23 | # CMDLINE for raspberrypi |
| 24 | CMDLINE = "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" | 24 | CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" |
| 25 | 25 | ||
| 26 | # Add the kernel debugger over console kernel command line option if enabled | 26 | # Add the kernel debugger over console kernel command line option if enabled |
| 27 | CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}' | 27 | CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}' |