diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2015-02-07 23:57:00 +0200 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2015-02-08 00:01:36 +0200 |
commit | b89a2743fb27b2e5644a74fae156b88a4ca48781 (patch) | |
tree | 0764a6b0d0a4f34c77be3556f1773813ac7f7cd3 | |
parent | b99a09b25757ea2afe15fcf31323420edca1137d (diff) | |
download | meta-raspberrypi-b89a2743fb27b2e5644a74fae156b88a4ca48781.tar.gz |
raspberrypi.conf: Split in specific and common conf. files
*.conf files should hold board specific stuff while rpi-base.inc should
include configuration that is common for all Raspberry Pi boards.
Remove MACHINE_KERNEL_PR as we don't use it anymore.
Minor tweaks.
Change-Id: I5e1b12c1d224ac003d2890544beb036f1d5d8643
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r-- | conf/machine/include/rpi-base.inc | 46 | ||||
-rw-r--r-- | conf/machine/raspberrypi.conf | 53 |
2 files changed, 47 insertions, 52 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc new file mode 100644 index 0000000..4be28a1 --- /dev/null +++ b/conf/machine/include/rpi-base.inc | |||
@@ -0,0 +1,46 @@ | |||
1 | include conf/machine/include/rpi-default-settings.inc | ||
2 | include conf/machine/include/rpi-default-versions.inc | ||
3 | include conf/machine/include/rpi-default-providers.inc | ||
4 | |||
5 | IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" | ||
6 | |||
7 | SERIAL_CONSOLE ?= "115200 ttyAMA0" | ||
8 | |||
9 | XSERVER = " \ | ||
10 | xserver-xorg \ | ||
11 | xf86-input-evdev \ | ||
12 | xf86-input-mouse \ | ||
13 | xf86-input-keyboard \ | ||
14 | xf86-video-fbdev \ | ||
15 | " | ||
16 | |||
17 | # Really supported starting from linux-raspberrypi 3.18.y only | ||
18 | #KERNEL_DEVICETREE ?= " \ | ||
19 | # bcm2708-rpi-b.dtb \ | ||
20 | # bcm2708-rpi-b-plus.dtb \ | ||
21 | # ds1307-rtc-overlay.dtb \ | ||
22 | # hifiberry-amp-overlay.dtb \ | ||
23 | # hifiberry-dac-overlay.dtb \ | ||
24 | # hifiberry-dacplus-overlay.dtb \ | ||
25 | # hifiberry-digi-overlay.dtb \ | ||
26 | # iqaudio-dac-overlay.dtb \ | ||
27 | # iqaudio-dacplus-overlay.dtb \ | ||
28 | # lirc-rpi-overlay.dtb \ | ||
29 | # pcf8523-rtc-overlay.dtb \ | ||
30 | # pps-gpio-overlay.dtb \ | ||
31 | # w1-gpio-overlay.dtb \ | ||
32 | # w1-gpio-pullup-overlay.dtb \ | ||
33 | # " | ||
34 | KERNEL_IMAGETYPE ?= "Image" | ||
35 | |||
36 | MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" | ||
37 | |||
38 | # Raspberry Pi has no hardware clock | ||
39 | MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" | ||
40 | |||
41 | MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" | ||
42 | |||
43 | # Set Raspberrypi splash image | ||
44 | SPLASH = "psplash-raspberrypi" | ||
45 | |||
46 | IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};kernel.img" | ||
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index af0907e..4e887b3 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf | |||
@@ -1,57 +1,6 @@ | |||
1 | #@TYPE: Machine | 1 | #@TYPE: Machine |
2 | #@NAME: RaspberryPi Development Board | 2 | #@NAME: RaspberryPi Development Board |
3 | #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board | 3 | #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board |
4 | #@MAINTAINER: John Willis | ||
5 | 4 | ||
6 | include conf/machine/include/rpi-default-settings.inc | ||
7 | include conf/machine/include/rpi-default-versions.inc | ||
8 | include conf/machine/include/rpi-default-providers.inc | ||
9 | require conf/machine/include/tune-arm1176jzf-s.inc | 5 | require conf/machine/include/tune-arm1176jzf-s.inc |
10 | 6 | include conf/machine/include/rpi-base.inc | |
11 | IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" | ||
12 | |||
13 | SERIAL_CONSOLE = "115200 ttyAMA0" | ||
14 | |||
15 | MACHINE_KERNEL_PR = "r5" | ||
16 | |||
17 | XSERVER = " \ | ||
18 | xserver-xorg \ | ||
19 | xf86-input-evdev \ | ||
20 | xf86-input-mouse \ | ||
21 | xf86-input-keyboard \ | ||
22 | xf86-video-fbdev \ | ||
23 | " | ||
24 | |||
25 | KERNEL_IMAGETYPE ?= "Image" | ||
26 | |||
27 | # Really supported starting from linux-rapsberry 3.18.y only ! | ||
28 | #KERNEL_DEVICETREE ?= " \ | ||
29 | # bcm2708-rpi-b.dtb \ | ||
30 | # bcm2708-rpi-b-plus.dtb \ | ||
31 | # ds1307-rtc-overlay.dtb \ | ||
32 | # hifiberry-amp-overlay.dtb \ | ||
33 | # hifiberry-dac-overlay.dtb \ | ||
34 | # hifiberry-dacplus-overlay.dtb \ | ||
35 | # hifiberry-digi-overlay.dtb \ | ||
36 | # iqaudio-dac-overlay.dtb \ | ||
37 | # iqaudio-dacplus-overlay.dtb \ | ||
38 | # lirc-rpi-overlay.dtb \ | ||
39 | # pcf8523-rtc-overlay.dtb \ | ||
40 | # pps-gpio-overlay.dtb \ | ||
41 | # w1-gpio-overlay.dtb \ | ||
42 | # w1-gpio-pullup-overlay.dtb \ | ||
43 | # " | ||
44 | |||
45 | MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" | ||
46 | |||
47 | #RaspberryPi has no hardware clock | ||
48 | MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" | ||
49 | |||
50 | MACHINE_EXTRA_RRECOMMENDS += " \ | ||
51 | kernel-modules \ | ||
52 | " | ||
53 | |||
54 | # Set raspberrypi splash image | ||
55 | SPLASH = "psplash-raspberrypi" | ||
56 | |||
57 | IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};kernel.img" | ||