[aml] Create single 'multi-board' project for all Amlogic devices, in…

…stead of Meson6-G18 and Meson8-K200
lockers90 · Nov 13, 2014 · 012b1ea · 012b1ea
1 parent 0504c44
commit 012b1ea
Show file tree

Hide file tree

Showing 70 changed files with 21 additions and 1,784 deletions.
diff --git a/...cts/Meson6-G18/filesystem/etc/asound.conf → ...ts/Amlogic/filesystem.g18/etc/asound.conf b/...cts/Meson6-G18/filesystem/etc/asound.conf → ...ts/Amlogic/filesystem.g18/etc/asound.conf
diff --git a/...cts/Meson6-G18/filesystem/etc/remote.conf → ...ts/Amlogic/filesystem.g18/etc/remote.conf b/...cts/Meson6-G18/filesystem/etc/remote.conf → ...ts/Amlogic/filesystem.g18/etc/remote.conf
diff --git a/...ts/Meson8-K200/filesystem/etc/asound.conf → ...s/Amlogic/filesystem.k200/etc/asound.conf b/...ts/Meson8-K200/filesystem/etc/asound.conf → ...s/Amlogic/filesystem.k200/etc/asound.conf
diff --git a/...ts/Meson8-K200/filesystem/etc/remote.conf → ...s/Amlogic/filesystem.k200/etc/remote.conf b/...ts/Meson8-K200/filesystem/etc/remote.conf → ...s/Amlogic/filesystem.k200/etc/remote.conf
diff --git a/...stem/lib/firmware/brcm/bcm40183-nvram.txt → ...k200/lib/firmware/brcm/bcm40183-nvram.txt b/...stem/lib/firmware/brcm/bcm40183-nvram.txt → ...k200/lib/firmware/brcm/bcm40183-nvram.txt
diff --git a/...ystem/lib/firmware/brcm/fw_bcm40183b2.bin → ....k200/lib/firmware/brcm/fw_bcm40183b2.bin b/...ystem/lib/firmware/brcm/fw_bcm40183b2.bin → ....k200/lib/firmware/brcm/fw_bcm40183b2.bin
diff --git a/...n8-K200/filesystem/usr/bin/brcm_wifi_init → ...ic/filesystem.k200/usr/bin/brcm_wifi_init b/...n8-K200/filesystem/usr/bin/brcm_wifi_init → ...ic/filesystem.k200/usr/bin/brcm_wifi_init
@@ -26,5 +26,5 @@
 
 lsmod | grep 8188
 if [ $? -ne 0 ]; then
-  modprobe dhd
+#  modprobe dhd
 fi
diff --git a/.../basic.target.wants/broadcom-wifi.service → .../basic.target.wants/broadcom-wifi.service b/.../basic.target.wants/broadcom-wifi.service → .../basic.target.wants/broadcom-wifi.service
diff --git a/.../lib/systemd/system/broadcom-wifi.service → .../lib/systemd/system/broadcom-wifi.service b/.../lib/systemd/system/broadcom-wifi.service → .../lib/systemd/system/broadcom-wifi.service
diff --git a/...lesystem/usr/lib/modules-load.d/mali.conf → ...lesystem/usr/lib/modules-load.d/mali.conf b/...lesystem/usr/lib/modules-load.d/mali.conf → ...lesystem/usr/lib/modules-load.d/mali.conf
diff --git a/projects/Meson8-K200/initramfs/platform_init → projects/Amlogic/initramfs/platform_init b/projects/Meson8-K200/initramfs/platform_init → projects/Amlogic/initramfs/platform_init
diff --git a/...ects/Meson6-G18/kodi/advancedsettings.xml → projects/Amlogic/kodi/advancedsettings.xml b/...ects/Meson6-G18/kodi/advancedsettings.xml → projects/Amlogic/kodi/advancedsettings.xml
diff --git a/projects/Meson6-G18/linux/linux.arm.conf → projects/Amlogic/linux/linux.arm.g18.conf b/projects/Meson6-G18/linux/linux.arm.conf → projects/Amlogic/linux/linux.arm.g18.conf
diff --git a/projects/Meson8-K200/linux/linux.arm.conf → projects/Amlogic/linux/linux.arm.k200.conf b/projects/Meson8-K200/linux/linux.arm.conf → projects/Amlogic/linux/linux.arm.k200.conf
diff --git a/projects/Meson6-G18/options → projects/Amlogic/options b/projects/Meson6-G18/options → projects/Amlogic/options
@@ -92,10 +92,7 @@
   UBOOT_CONFIGFILE=""
 
 # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-  KERNEL_UBOOT_TARGET="uImage-dtb"
-
-# Kernel extra targets to build
-  KERNEL_UBOOT_EXTRA_TARGET="meson6_g18.dtd"
+  KERNEL_UBOOT_TARGET="uImage"
 
 # Additional kernel make parameters (for example to specify the u-boot loadaddress)
   KERNEL_MAKE_EXTRACMD=""
@@ -241,9 +238,6 @@
 # OpenGL(X) implementation to use (no / Mesa)
   OPENGL="no"
 
-# OpenGL-ES implementation to use (no / bcm2835-driver)
-  OPENGLES="opengl-meson6"
-
 # Windowmanager to use (ratpoison / fluxbox / none)
   WINDOWMANAGER="none"
 

diff --git a/projects/Amlogic/options.g18 b/projects/Amlogic/options.g18
@@ -0,0 +1,8 @@
+# Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
+  KERNEL_UBOOT_TARGET="uImage-dtb"
+
+# Kernel extra targets to build
+  KERNEL_UBOOT_EXTRA_TARGET="meson6_g18.dtd"
+
+# OpenGL-ES implementation to use (no / bcm2835-driver / opengl-meson6 / opengl-meson8)
+  OPENGLES="opengl-meson6"
diff --git a/projects/Amlogic/options.k200 b/projects/Amlogic/options.k200
@@ -0,0 +1,11 @@
+# Kernel extra targets to build
+  KERNEL_UBOOT_EXTRA_TARGET="meson8_k200a_2G.dtd meson8_k200a_2G.dtb"
+
+# Build Android kernel image using mkbootimg
+  BUILD_ANDROID_BOOTIMG="yes"
+
+# Path to a file that will be passed as the --second parameter to Android mkbootimg
+  ANDROID_BOOTIMG_SECOND="arch/arm/boot/dts/amlogic/meson8_k200a_2G.dtb"
+
+# OpenGL-ES implementation to use (no / bcm2835-driver / opengl-meson6 / opengl-meson8)
+  OPENGLES="opengl-meson8"
diff --git a/...nd-output-for-Amlogic-based-devices.patch → ...nd-output-for-Amlogic-based-devices.patch b/...nd-output-for-Amlogic-based-devices.patch → ...nd-output-for-Amlogic-based-devices.patch
diff --git a/...ssthrough-for-Amlogic-based-devices.patch → ...ssthrough-for-Amlogic-based-devices.patch b/...ssthrough-for-Amlogic-based-devices.patch → ...ssthrough-for-Amlogic-based-devices.patch
diff --git a/...1080-output-without-upscaling-on-Am.patch → ...1080-output-without-upscaling-on-Am.patch b/...1080-output-without-upscaling-on-Am.patch → ...1080-output-without-upscaling-on-Am.patch
diff --git a/...etrieval-of-CPU-temperature-on-Amlo.patch → ...etrieval-of-CPU-temperature-on-Amlo.patch b/...etrieval-of-CPU-temperature-on-Amlo.patch → ...etrieval-of-CPU-temperature-on-Amlo.patch
diff --git a/...for-AV-CVBS-video-output-on-Amlogic.patch → ...for-AV-CVBS-video-output-on-Amlogic.patch b/...for-AV-CVBS-video-output-on-Amlogic.patch → ...for-AV-CVBS-video-output-on-Amlogic.patch
diff --git a/...n-the-video-display-is-disabled-aft.patch → ...n-the-video-display-is-disabled-aft.patch b/...n-the-video-display-is-disabled-aft.patch → ...n-the-video-display-is-disabled-aft.patch
diff --git a/...rtual-consoles-when-changing-frameb.patch → ...rtual-consoles-when-changing-frameb.patch b/...rtual-consoles-when-changing-frameb.patch → ...rtual-consoles-when-changing-frameb.patch
diff --git a/...-in-configure-script-to-prevent-lin.patch → ...-in-configure-script-to-prevent-lin.patch b/...-in-configure-script-to-prevent-lin.patch → ...-in-configure-script-to-prevent-lin.patch
diff --git a/...mple-rates-that-are-supported-by-AL.patch → ...mple-rates-that-are-supported-by-AL.patch b/...mple-rates-that-are-supported-by-AL.patch → ...mple-rates-that-are-supported-by-AL.patch
diff --git a/...ckets-completely-when-resampling-to.patch → ...ckets-completely-when-resampling-to.patch b/...ckets-completely-when-resampling-to.patch → ...ckets-completely-when-resampling-to.patch
diff --git a/...nd-fpsscale-instead-of-rfpsrate-and.patch → ...nd-fpsscale-instead-of-rfpsrate-and.patch b/...nd-fpsscale-instead-of-rfpsrate-and.patch → ...nd-fpsscale-instead-of-rfpsrate-and.patch
diff --git a/...me-rate-detection-of-some-videos-wi.patch → ...me-rate-detection-of-some-videos-wi.patch b/...me-rate-detection-of-some-videos-wi.patch → ...me-rate-detection-of-some-videos-wi.patch
diff --git a/...y-if-they-were-modified-after-the-l.patch → ...y-if-they-were-modified-after-the-l.patch b/...y-if-they-were-modified-after-the-l.patch → ...y-if-they-were-modified-after-the-l.patch
diff --git a/...video-stuttering-during-playback-of.patch → ...video-stuttering-during-playback-of.patch b/...video-stuttering-during-playback-of.patch → ...video-stuttering-during-playback-of.patch
diff --git a/...endency-on-libamplayer-and-amffmpeg.patch → ...endency-on-libamplayer-and-amffmpeg.patch b/...endency-on-libamplayer-and-amffmpeg.patch → ...endency-on-libamplayer-and-amffmpeg.patch
diff --git a/...-Add-some-key-mappings-for-HDMI-CEC.patch → ...-Add-some-key-mappings-for-HDMI-CEC.patch b/...-Add-some-key-mappings-for-HDMI-CEC.patch → ...-Add-some-key-mappings-for-HDMI-CEC.patch
diff --git a/...pping_for_browser_home_key_on_linux.patch → ...pping_for_browser_home_key_on_linux.patch b/...pping_for_browser_home_key_on_linux.patch → ...pping_for_browser_home_key_on_linux.patch
diff --git a/...g_of_sd_video_with_am-mpeg2_decoder.patch → ...g_of_sd_video_with_am-mpeg2_decoder.patch b/...g_of_sd_video_with_am-mpeg2_decoder.patch → ...g_of_sd_video_with_am-mpeg2_decoder.patch
diff --git a/.../enable_remoteaskeyboard_by_default.patch → .../enable_remoteaskeyboard_by_default.patch b/.../enable_remoteaskeyboard_by_default.patch → .../enable_remoteaskeyboard_by_default.patch
diff --git a/...badness_when_compiling_with_amcodec.patch → ...badness_when_compiling_with_amcodec.patch b/...badness_when_compiling_with_amcodec.patch → ...badness_when_compiling_with_amcodec.patch
diff --git a/...di/make_esc_key_execute_back_action.patch → ...di/make_esc_key_execute_back_action.patch b/...di/make_esc_key_execute_back_action.patch → ...di/make_esc_key_execute_back_action.patch
diff --git a/...erform_suspend_instead_of_powerdown.patch → ...erform_suspend_instead_of_powerdown.patch b/...erform_suspend_instead_of_powerdown.patch → ...erform_suspend_instead_of_powerdown.patch
diff --git a/...s/linux/add_bootargs_to_device_tree.patch → ...nux/g18/add_bootargs_to_device_tree.patch b/...s/linux/add_bootargs_to_device_tree.patch → ...nux/g18/add_bootargs_to_device_tree.patch
diff --git a/...n6-G18/patches/linux/no_dev_console.patch → ...mlogic/patches/linux/no_dev_console.patch b/...n6-G18/patches/linux/no_dev_console.patch → ...mlogic/patches/linux/no_dev_console.patch
diff --git a/projects/Meson6-G18/bootloader/boot.cfg b/projects/Meson6-G18/bootloader/boot.cfg
diff --git a/projects/Meson6-G18/bootloader/uEnv.txt b/projects/Meson6-G18/bootloader/uEnv.txt
diff --git a/projects/Meson6-G18/initramfs/platform_init b/projects/Meson6-G18/initramfs/platform_init
diff --git a/projects/Meson6-G18/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch b/projects/Meson6-G18/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch
diff --git a/...ects/Meson6-G18/patches/kodi/0002-Allow-audio-passthrough-for-Amlogic-based-devices.patch b/...ects/Meson6-G18/patches/kodi/0002-Allow-audio-passthrough-for-Amlogic-based-devices.patch
diff --git a/...s/Meson6-G18/patches/kodi/0003-Enable-true-1920x1080-output-without-upscaling-on-Am.patch b/...s/Meson6-G18/patches/kodi/0003-Enable-true-1920x1080-output-without-upscaling-on-Am.patch
diff --git a/...s/Meson6-G18/patches/kodi/0004-Add-support-for-retrieval-of-CPU-temperature-on-Amlo.patch b/...s/Meson6-G18/patches/kodi/0004-Add-support-for-retrieval-of-CPU-temperature-on-Amlo.patch