mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

Neo1973 (gta01/02): merge configs with OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3531 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-01-18 12:56:22 +00:00
parent 3811d80493
commit 9dbd684b5a
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/machine/fic-gta01.conf
+2 -5
View File
@@ -11,11 +11,12 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000" UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "285" MACHINE_DISPLAY_PPI = "285"
XSERVER = "xserver-kdrive-fbdev"
# package machine specific modules # package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\ MACHINE_EXTRA_RRECOMMENDS = "\
@@ -24,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-gsm \ kernel-module-gta01-pm-gsm \
kernel-module-gta01kbd \ kernel-module-gta01kbd \
kernel-module-s3cmci \ kernel-module-s3cmci \
kernel-module-ext2 \
kernel-module-vfat \
kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-neo1973-wm8753 \
kernel-module-snd-soc-smdk2440 \ kernel-module-snd-soc-smdk2440 \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437 \
" "
# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
meta/conf/machine/fic-gta02.conf
+8 -7
View File
@@ -11,11 +11,12 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000" UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "285" MACHINE_DISPLAY_PPI = "285"
XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
# package machine specific modules # package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\ MACHINE_EXTRA_RRECOMMENDS = "\
@@ -24,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-gsm \ kernel-module-gta01-pm-gsm \
kernel-module-gta01kbd \ kernel-module-gta01kbd \
kernel-module-s3cmci \ kernel-module-s3cmci \
kernel-module-ext2 \ kernel-module-snd-soc-neo1973-gta02-wm8753 \
kernel-module-vfat \
kernel-module-snd-soc-neo1973-wm8753 \
kernel-module-snd-soc-smdk2440 \ kernel-module-snd-soc-smdk2440 \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437 \
" "
SERIAL_CONSOLE = "115200 ttySAC2" SERIAL_CONSOLE = "115200 ttySAC2"
@@ -38,7 +35,11 @@ SERIAL_CONSOLE = "115200 ttySAC2"
ROOT_FLASH_SIZE = "256" ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks # extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
--no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
--littleendian --pad \
-i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
# build / upload tools # build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"