diff options
-rw-r--r-- | meta/packages/linux/linux-rp.inc | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc index ee9bbfe7f6..d489e2a388 100644 --- a/meta/packages/linux/linux-rp.inc +++ b/meta/packages/linux/linux-rp.inc | |||
@@ -13,7 +13,6 @@ BASRC = "http://www.orca.cx/zaurus/patches" | |||
13 | CHSRC = "http://oz.drigon.com/patches" | 13 | CHSRC = "http://oz.drigon.com/patches" |
14 | TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" | 14 | TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" |
15 | 15 | ||
16 | EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" | ||
17 | COMPATIBLE_HOST = "(arm|i.86).*-linux" | 16 | COMPATIBLE_HOST = "(arm|i.86).*-linux" |
18 | COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal|zylonite)' | 17 | COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal|zylonite)' |
19 | 18 | ||
@@ -47,11 +46,6 @@ CMDLINE_ROTATE_poodle = "fbcon=rotate:1" | |||
47 | CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" | 46 | CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" |
48 | 47 | ||
49 | ############################################################### | 48 | ############################################################### |
50 | # Enable or disable ELPP via local.conf - default is "no" | ||
51 | # | ||
52 | ENABLE_ELPP = '${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}' | ||
53 | |||
54 | ############################################################### | ||
55 | # module configs specific to this kernel | 49 | # module configs specific to this kernel |
56 | # | 50 | # |
57 | module_autoload_ohci-hcd_tosa = "ohci-hcd" | 51 | module_autoload_ohci-hcd_tosa = "ohci-hcd" |
@@ -98,15 +92,6 @@ do_configure() { | |||
98 | 92 | ||
99 | echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config | 93 | echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config |
100 | 94 | ||
101 | #if [ "${ENABLE_ELPP}" = "yes" ]; then | ||
102 | # echo "# Enhanced Linux Progress Patch" >> ${S}/.config | ||
103 | # echo "CONFIG_FB_ELPP=y" >> ${S}/.config | ||
104 | # echo "CONFIG_LOGO=y" >> ${S}/.config | ||
105 | # echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config | ||
106 | #else | ||
107 | # echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config | ||
108 | #fi | ||
109 | |||
110 | if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then | 95 | if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then |
111 | echo "CONFIG_AEABI=y" >> ${S}/.config | 96 | echo "CONFIG_AEABI=y" >> ${S}/.config |
112 | echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config | 97 | echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config |
@@ -115,28 +100,7 @@ do_configure() { | |||
115 | echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config | 100 | echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config |
116 | fi | 101 | fi |
117 | 102 | ||
118 | if [ "${DISTRO}" = "openzaurus" -a "${MACHINE}" != "collie" ]; then | 103 | if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then |
119 | case ${MACHINE} in | ||
120 | c7x0 | akita | spitz ) | ||
121 | echo "CONFIG_LOGO_OZ640_CLUT224=y" >> ${S}/.config | ||
122 | echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config | ||
123 | echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config | ||
124 | ;; | ||
125 | tosa ) | ||
126 | echo "CONFIG_LOGO_OZ480_CLUT224=y" >> ${S}/.config | ||
127 | echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config | ||
128 | echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config | ||
129 | ;; | ||
130 | poodle | collie ) | ||
131 | echo "CONFIG_LOGO_OZ240_CLUT224=y" >> ${S}/.config | ||
132 | echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config | ||
133 | echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config | ||
134 | ;; | ||
135 | esac | ||
136 | echo "CONFIG_LOGO=y" >> ${S}/.config | ||
137 | echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config | ||
138 | echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config | ||
139 | elif [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then | ||
140 | echo "CONFIG_LOGO=y" >> ${S}/.config | 104 | echo "CONFIG_LOGO=y" >> ${S}/.config |
141 | echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config | 105 | echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config |
142 | echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config | 106 | echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config |