From 4a750de6dd983eee7db8cd81d98ebb680a405267 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2010 12:41:40 +0100 Subject: use correct speed for wrap --- scripts/install.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index a6b1ce331..bfd2ababc 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -132,6 +132,15 @@ if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then fi fi +case $2 in + wrap*) + speed=38400 + ;; + *) + speed=115200 + ;; +esac + if [ $rb532 -ne 0 ];then printf "Create partition and filesystem for rb532\n" rootpart=${1}2 @@ -209,14 +218,14 @@ if [ $rb532 -eq 0 ];then cat << EOF > $tmp/boot/grub/grub.cfg set default=0 set timeout=1 -serial --unit=0 --speed=115200 +serial --unit=0 --speed=$speed terminal_output serial terminal_input serial menuentry "GNU/Linux (OpenADK)" { insmod ext2 set root=(hd0,1) - linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,115200 console=tty0 panic=10 + linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,$speed console=tty0 panic=10 } EOF chroot $tmp grub-install $1 -- cgit v1.2.3 From 03d5db200debe0f42a45824f80dc39152b173cf7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2010 12:57:19 +0100 Subject: alphabetical order of menu entries, add back buildsystem configuration in /etc feature --- package/Config.in | 351 ++++++++++++++++++------------------ package/base-files/Config.in.manual | 10 + 2 files changed, 183 insertions(+), 178 deletions(-) create mode 100644 package/base-files/Config.in.manual diff --git a/package/Config.in b/package/Config.in index 378ec7c2a..68c81aad1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -6,6 +6,7 @@ menu "Package selection" menu "Basesystem" source "package/adkinstall/Config.in" source "package/base-files/Config.in" +source "package/base-files/Config.in.manual" source "package/busybox/Config.in.manual" source "package/cfgfs/Config.in" source "package/cryptinit/Config.in" @@ -64,6 +65,19 @@ source "package/strace/Config.in" source "package/valgrind/Config.in" endmenu +menu "DNS / DHCP" +source "package/atftp/Config.in" +source "package/avahi/Config.in" +source "package/bind/Config.in" +source "package/dhcp/Config.in" +source "package/dhcp-forwarder/Config.in" +source "package/dnsmasq/Config.in" +source "package/ez-ipupdate/Config.in" +source "package/maradns/Config.in" +source "package/pdnsd/Config.in" +source "package/updatedd/Config.in" +endmenu + menu "Filesystem / Blockdevice utilities" source "package/aufs2-util/Config.in" source "package/dosfstools/Config.in" @@ -79,133 +93,26 @@ source "package/wdfs/Config.in" source "package/xfsprogs/Config.in" endmenu -menu "Mail" -source "package/bogofilter/Config.in" -source "package/dovecot/Config.in" -source "package/fetchmail/Config.in" -source "package/mini_sendmail/Config.in" -source "package/mutt/Config.in" -source "package/procmail/Config.in" -source "package/ssmtp/Config.in" -source "package/vilistextum/Config.in" -endmenu - -menu "Misc" -source "package/collectd/Config.in" -source "package/deco/Config.in" -source "package/dialog/Config.in" -source "package/digitemp/Config.in" -source "package/gpm/Config.in" -source "package/gpsd/Config.in" -source "package/logrotate/Config.in" -source "package/mc/Config.in" -source "package/mgetty/Config.in" -source "package/monit/Config.in" -source "package/motion/Config.in" -source "package/osiris/Config.in" -source "package/rrdtool/Config.in" -source "package/rrdcollect/Config.in" -source "package/sane-backends/Config.in" -source "package/screen/Config.in" -source "package/scsi-spin/Config.in" -source "package/ser2net/Config.in" -source "package/sqlite/Config.in" -source "package/syslog-ng/Config.in" -endmenu - -menu "Multimedia" -source "package/alsa-utils/Config.in" -source "package/esound/Config.in" -source "package/ffmpeg/Config.in" -source "package/gmediaserver/Config.in" -source "package/icecast/Config.in" -source "package/lame/Config.in" -source "package/madplay/Config.in" -source "package/mpg123/Config.in" -source "package/moc/Config.in" -source "package/mpd/Config.in" -source "package/mplayer/Config.in" -source "package/mt-daapd/Config.in" -source "package/palantir/Config.in" -source "package/setpwc/Config.in" -endmenu - -menu "Shells" -source "package/bash/Config.in" -source "package/mksh/Config.in" -source "package/tcsh/Config.in" -source "package/zsh/Config.in" -endmenu - - -menu "Serial communications & terminal emulation" -source "package/heyu/Config.in" -source "package/lrzsz/Config.in" -source "package/picocom/Config.in" -source "package/serdisplib/Config.in" -source "package/setserial/Config.in" -endmenu - -menu "Telephony" -source "package/asterisk/Config.in" -source "package/opensips/Config.in" -endmenu - -menu "Utilities" -source "package/bc/Config.in" -source "package/comgt/Config.in" -source "package/cpufrequtils/Config.in" -source "package/fbset/Config.in" -source "package/file/Config.in" -source "package/findutils/Config.in" -source "package/hdparm/Config.in" -source "package/usbutils/Config.in" -source "package/patch/Config.in" -source "package/pciutils/Config.in" -source "package/procps/Config.in" -source "package/sispmctl/Config.in" -source "package/stress/Config.in" -source "package/sysstat/Config.in" -source "package/swconfig/Config.in" -source "package/udev/Config.in" -source "package/watchdog/Config.in" -endmenu - - -menu "Network - Analyze / Debugging / Monitoring" -source "package/bwm/Config.in" -source "package/dsniff/Config.in" -source "package/ethtool/Config.in" -source "package/fping/Config.in" -source "package/fprobe/Config.in" -source "package/fprobe-ulog/Config.in" -source "package/httping/Config.in" -source "package/iftop/Config.in" -source "package/ipcad/Config.in" -source "package/iperf/Config.in" -source "package/iptraf/Config.in" -source "package/mtr/Config.in" -source "package/netperf/Config.in" -source "package/nmap/Config.in" -source "package/sipsak/Config.in" -source "package/tcpdump/Config.in" -source "package/tptest/Config.in" -source "package/traceroute/Config.in" -source "package/trafshow/Config.in" -source "package/ttcp/Config.in" -endmenu - -menu "DNS / DHCP" -source "package/atftp/Config.in" -source "package/avahi/Config.in" -source "package/bind/Config.in" -source "package/dhcp/Config.in" -source "package/dhcp-forwarder/Config.in" -source "package/dnsmasq/Config.in" -source "package/ez-ipupdate/Config.in" -source "package/maradns/Config.in" -source "package/pdnsd/Config.in" -source "package/updatedd/Config.in" +menu "Firewall / Routing / Bridging" +source "package/arpd/Config.in" +source "package/bridge-utils/Config.in" +source "package/linux-atm/Config.in" +source "package/cutter/Config.in" +source "package/ebtables/Config.in" +source "package/ether-wake/Config.in" +source "package/iproute2/Config.in" +source "package/ipset/Config.in" +source "package/iptables/Config.in" +source "package/knock/Config.in" +source "package/macchanger/Config.in" +source "package/netstat-nat/Config.in" +source "package/quagga/Config.in" +source "package/ulogd/Config.in" +source "package/shorewall-common/Config.in" +source "package/shorewall-shell/Config.in" +source "package/wol/Config.in" +source "package/wondershaper/Config.in" +source "package/vrrpd/Config.in" endmenu menu "HTTP / FTP" @@ -237,28 +144,6 @@ source "package/reaim/Config.in" source "package/tmsnc/Config.in" endmenu -menu "Firewall / Routing / Bridging" -source "package/arpd/Config.in" -source "package/bridge-utils/Config.in" -source "package/linux-atm/Config.in" -source "package/cutter/Config.in" -source "package/ebtables/Config.in" -source "package/ether-wake/Config.in" -source "package/iproute2/Config.in" -source "package/ipset/Config.in" -source "package/iptables/Config.in" -source "package/knock/Config.in" -source "package/macchanger/Config.in" -source "package/netstat-nat/Config.in" -source "package/quagga/Config.in" -source "package/ulogd/Config.in" -source "package/shorewall-common/Config.in" -source "package/shorewall-shell/Config.in" -source "package/wol/Config.in" -source "package/wondershaper/Config.in" -source "package/vrrpd/Config.in" -endmenu - menu "Libraries" source "package/alsa-lib/Config.in" source "package/apr/Config.in" @@ -441,6 +326,79 @@ source "package/ustl/Config.in" source "package/zlib/Config.in" endmenu +menu "Mail" +source "package/bogofilter/Config.in" +source "package/dovecot/Config.in" +source "package/fetchmail/Config.in" +source "package/mini_sendmail/Config.in" +source "package/mutt/Config.in" +source "package/procmail/Config.in" +source "package/ssmtp/Config.in" +source "package/vilistextum/Config.in" +endmenu + +menu "Misc" +source "package/collectd/Config.in" +source "package/deco/Config.in" +source "package/dialog/Config.in" +source "package/digitemp/Config.in" +source "package/gpm/Config.in" +source "package/gpsd/Config.in" +source "package/logrotate/Config.in" +source "package/mc/Config.in" +source "package/mgetty/Config.in" +source "package/monit/Config.in" +source "package/motion/Config.in" +source "package/osiris/Config.in" +source "package/rrdtool/Config.in" +source "package/rrdcollect/Config.in" +source "package/sane-backends/Config.in" +source "package/screen/Config.in" +source "package/scsi-spin/Config.in" +source "package/ser2net/Config.in" +source "package/sqlite/Config.in" +source "package/syslog-ng/Config.in" +endmenu + +menu "Multimedia" +source "package/alsa-utils/Config.in" +source "package/esound/Config.in" +source "package/ffmpeg/Config.in" +source "package/gmediaserver/Config.in" +source "package/icecast/Config.in" +source "package/lame/Config.in" +source "package/madplay/Config.in" +source "package/mpg123/Config.in" +source "package/moc/Config.in" +source "package/mpd/Config.in" +source "package/mplayer/Config.in" +source "package/mt-daapd/Config.in" +source "package/palantir/Config.in" +source "package/setpwc/Config.in" +endmenu + +menu "Network - Analyze / Debugging / Monitoring" +source "package/bwm/Config.in" +source "package/dsniff/Config.in" +source "package/ethtool/Config.in" +source "package/fping/Config.in" +source "package/fprobe/Config.in" +source "package/fprobe-ulog/Config.in" +source "package/httping/Config.in" +source "package/iftop/Config.in" +source "package/ipcad/Config.in" +source "package/iperf/Config.in" +source "package/iptraf/Config.in" +source "package/mtr/Config.in" +source "package/netperf/Config.in" +source "package/nmap/Config.in" +source "package/sipsak/Config.in" +source "package/tcpdump/Config.in" +source "package/tptest/Config.in" +source "package/traceroute/Config.in" +source "package/trafshow/Config.in" +source "package/ttcp/Config.in" +endmenu menu "Networking Misc" source "package/cups/Config.in" @@ -476,6 +434,28 @@ source "package/nfs-utils/Config.in" source "package/samba/Config.in" endmenu +menu "Network Security" +source "package/arpwatch/Config.in" +source "package/autossh/Config.in" +source "package/axtls/Config.in" +source "package/ca-certificates/Config.in" +source "package/dropbear/Config.in" +source "package/httptunnel/Config.in" +source "package/ipsec-tools/Config.in" +source "package/l2tpns/Config.in" +source "package/openssh/Config.in" +source "package/openssh/Config.in.kerberos" +source "package/openswan/Config.in" +source "package/openvpn/Config.in" +source "package/portsentry/Config.in" +source "package/ptunnel/Config.in" +source "package/scanlogd/Config.in" +source "package/snort/Config.in" +source "package/ssltunnel/Config.in" +source "package/tinc/Config.in" +source "package/vpnc/Config.in" +endmenu + menu "NTP" source "package/htpdate/Config.in" source "package/ntpclient/Config.in" @@ -537,28 +517,6 @@ source "package/ruby/Config.in" source "package/tcl/Config.in" endmenu -menu "Networking Security" -source "package/arpwatch/Config.in" -source "package/autossh/Config.in" -source "package/axtls/Config.in" -source "package/ca-certificates/Config.in" -source "package/dropbear/Config.in" -source "package/httptunnel/Config.in" -source "package/ipsec-tools/Config.in" -source "package/l2tpns/Config.in" -source "package/openssh/Config.in" -source "package/openssh/Config.in.kerberos" -source "package/openswan/Config.in" -source "package/openvpn/Config.in" -source "package/portsentry/Config.in" -source "package/ptunnel/Config.in" -source "package/scanlogd/Config.in" -source "package/snort/Config.in" -source "package/ssltunnel/Config.in" -source "package/tinc/Config.in" -source "package/vpnc/Config.in" -endmenu - menu "SCM" #source "package/bzr/Config.in" source "package/cvs/Config.in" @@ -566,6 +524,46 @@ source "package/git/Config.in" source "package/subversion/Config.in" endmenu +menu "Shells" +source "package/bash/Config.in" +source "package/mksh/Config.in" +source "package/tcsh/Config.in" +source "package/zsh/Config.in" +endmenu + +menu "Serial communications & terminal emulation" +source "package/heyu/Config.in" +source "package/lrzsz/Config.in" +source "package/picocom/Config.in" +source "package/serdisplib/Config.in" +source "package/setserial/Config.in" +endmenu + +menu "Telephony" +source "package/asterisk/Config.in" +source "package/opensips/Config.in" +endmenu + +menu "Utilities" +source "package/bc/Config.in" +source "package/comgt/Config.in" +source "package/cpufrequtils/Config.in" +source "package/fbset/Config.in" +source "package/file/Config.in" +source "package/findutils/Config.in" +source "package/hdparm/Config.in" +source "package/usbutils/Config.in" +source "package/patch/Config.in" +source "package/pciutils/Config.in" +source "package/procps/Config.in" +source "package/sispmctl/Config.in" +source "package/stress/Config.in" +source "package/sysstat/Config.in" +source "package/swconfig/Config.in" +source "package/udev/Config.in" +source "package/watchdog/Config.in" +endmenu + menu "Wireless" source "package/aircrack-ng/Config.in" source "package/chillispot/Config.in" @@ -579,8 +577,7 @@ source "package/wifidog/Config.in" source "package/wpa_supplicant/Config.in" endmenu - -menu "Xorg server and drivers" +menu "X server and drivers" source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" @@ -589,7 +586,7 @@ source "package/xf86-input-keyboard/Config.in" source "package/xf86-input-evtouch/Config.in" endmenu -menu "X Applications" +menu "X applications" source "package/evilwm/Config.in" source "package/font-util/Config.in" source "package/rxvt-unicode/Config.in" @@ -597,7 +594,7 @@ source "package/xauth/Config.in" source "package/xlsfonts/Config.in" endmenu -menu "X Fonts" +menu "X fonts" source "package/font-adobe-75dpi/Config.in" source "package/font-adobe-100dpi/Config.in" source "package/font-bitstream-75dpi/Config.in" @@ -613,7 +610,7 @@ source "package/font-misc-misc/Config.in" source "package/font-xfree86-type1/Config.in" endmenu -menu "X Libraries" +menu "X libraries" source "package/libICE/Config.in" source "package/libICE/Config.in.lib" source "package/libSM/Config.in" @@ -651,7 +648,6 @@ source "package/libXft/Config.in.lib" source "package/libXxf86dga/Config.in" source "package/libXxf86dga/Config.in.lib" source "package/pixman/Config.in" -#source "package/xf86dga/Config.in" source "package/xkbcomp/Config.in" source "package/xkeyboard-config/Config.in" endmenu @@ -660,4 +656,3 @@ endmenu menu "Kernel configuration" source "target/linux/Config.in" endmenu - diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual new file mode 100644 index 000000000..d750ff3ef --- /dev/null +++ b/package/base-files/Config.in.manual @@ -0,0 +1,10 @@ +config ADK_PACKAGE_CONFIG_IN_ETC + prompt ".config in /etc.................. include buildsystem configuration in image" + bool + depends on ADK_PACKAGE_BASE_FILES + default y if !ADK_TOOLCHAIN_ONLY + help + Copy the configuration file (.config) to the image. The + file will be found in /etc/adkconfig.gz. This takes about + 7kBytes of file system space. From this file you can always rebuild + the image from source. -- cgit v1.2.3 From a4a69676b48a78e175e9f3d6b03df8b5ab29c5c1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2010 22:15:34 +0100 Subject: update foxg20 to 2.6.33, fix rsync reconfigure bug --- scripts/automake.dep | 1 + target/foxg20/patches/foxg20.patch | 79 +++++++++++++++----------------------- target/foxg20/target.mk | 4 +- 3 files changed, 35 insertions(+), 49 deletions(-) diff --git a/scripts/automake.dep b/scripts/automake.dep index 901d12912..13e4e87a9 100644 --- a/scripts/automake.dep +++ b/scripts/automake.dep @@ -1,5 +1,6 @@ configure configure.ac configure configure.in +configure configure.sh configure missing /Makefile.in /Makefile.am /Makefile.in configure.in diff --git a/target/foxg20/patches/foxg20.patch b/target/foxg20/patches/foxg20.patch index bda411c98..1f628574e 100644 --- a/target/foxg20/patches/foxg20.patch +++ b/target/foxg20/patches/foxg20.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/arm/include/asm/setup.h ---- linux-2.6.32.2.orig/arch/arm/include/asm/setup.h 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/include/asm/setup.h 2010-02-23 21:40:33.000000000 +0100 +diff -Nur linux-2.6.33.orig/arch/arm/include/asm/setup.h linux-2.6.33/arch/arm/include/asm/setup.h +--- linux-2.6.33.orig/arch/arm/include/asm/setup.h 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/include/asm/setup.h 2010-02-27 19:32:30.150085477 +0100 @@ -18,6 +18,8 @@ #define COMMAND_LINE_SIZE 1024 @@ -10,23 +10,22 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/a /* The list ends with an ATAG_NONE node. */ #define ATAG_NONE 0x00000000 -diff -Nur linux-2.6.32.2.orig/arch/arm/Kconfig linux-2.6.32.2/arch/arm/Kconfig ---- linux-2.6.32.2.orig/arch/arm/Kconfig 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/Kconfig 2010-02-23 21:18:53.000000000 +0100 -@@ -18,6 +18,9 @@ - select HAVE_KRETPROBES if (HAVE_KPROBES) +diff -Nur linux-2.6.33.orig/arch/arm/Kconfig linux-2.6.33/arch/arm/Kconfig +--- linux-2.6.33.orig/arch/arm/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/Kconfig 2010-02-27 20:23:52.139866005 +0100 +@@ -19,6 +19,8 @@ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) select HAVE_GENERIC_DMA_COHERENT -+ select HAVE_KERNEL_GZIP + select HAVE_KERNEL_GZIP + select HAVE_KERNEL_BZIP2 + select HAVE_KERNEL_LZMA + select HAVE_KERNEL_LZO help The ARM series is a line of low-power-consumption RISC chip designs - licensed by ARM Ltd and targeted at embedded applications and -diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/kernel/setup.c ---- linux-2.6.32.2.orig/arch/arm/kernel/setup.c 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/kernel/setup.c 2010-02-23 21:29:01.000000000 +0100 -@@ -806,8 +806,12 @@ +diff -Nur linux-2.6.33.orig/arch/arm/kernel/setup.c linux-2.6.33/arch/arm/kernel/setup.c +--- linux-2.6.33.orig/arch/arm/kernel/setup.c 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/kernel/setup.c 2010-02-27 19:32:30.212085837 +0100 +@@ -807,8 +807,12 @@ static int c_show(struct seq_file *m, void *v) { @@ -39,9 +38,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/ke seq_printf(m, "Processor\t: %s rev %d (%s)\n", cpu_name, read_cpuid_id() & 15, elf_platform); -diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c ---- linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-23 21:18:53.000000000 +0100 +diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c +--- linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-27 19:32:30.233294964 +0100 @@ -454,7 +454,15 @@ .sda_is_open_drain = 1, .scl_pin = AT91_PIN_PA24, @@ -58,9 +57,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6 }; static struct platform_device at91sam9260_twi_device = { -diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c ---- linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c 2010-02-23 21:33:34.000000000 +0100 +diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.33/arch/arm/mach-at91/board-foxg20.c +--- linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.33/arch/arm/mach-at91/board-foxg20.c 2010-02-27 19:32:30.235748629 +0100 @@ -0,0 +1,376 @@ +/* + * Copyright (C) 2005 SAN People @@ -438,15 +437,17 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/a + .init_irq = foxg20_init_irq, + .init_machine = foxg20_board_init, +MACHINE_END -diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm/mach-at91/Kconfig ---- linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/mach-at91/Kconfig 2010-02-23 21:18:53.000000000 +0100 -@@ -333,6 +333,13 @@ +diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Kconfig linux-2.6.33/arch/arm/mach-at91/Kconfig +--- linux-2.6.33.orig/arch/arm/mach-at91/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/mach-at91/Kconfig 2010-02-27 20:22:57.467867560 +0100 +@@ -354,6 +354,15 @@ Select this if you are using a Eukrea Electromatique's CPU9G20 Board +config MACH_FOXG20 + bool "Acme Systems FOX G20" ++ select HAVE_AT91_DATAFLASH_CARD ++ select HAVE_NAND_ATMEL_BUSWIDTH_16 + depends on ARCH_AT91SAM9G20 + help + Select this if you are using Acme Systems @@ -455,26 +456,10 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm endif # ---------------------------------------------------------- -@@ -388,13 +395,13 @@ - - config MTD_AT91_DATAFLASH_CARD - bool "Enable DataFlash Card support" -- depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926) -+ depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926 || MACH_FOXG20) - help - Enable support for the DataFlash card. - - config MTD_NAND_ATMEL_BUSWIDTH_16 - bool "Enable 16-bit data bus interface to NAND flash" -- depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK) -+ depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK || MACH_FOXG20) - help - On AT91SAM926x boards both types of NAND flash can be present - (8 and 16 bit data bus width). -diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/arm/mach-at91/Makefile ---- linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/arch/arm/mach-at91/Makefile 2010-02-23 21:18:53.000000000 +0100 -@@ -65,6 +65,9 @@ +diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Makefile linux-2.6.33/arch/arm/mach-at91/Makefile +--- linux-2.6.33.orig/arch/arm/mach-at91/Makefile 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/arm/mach-at91/Makefile 2010-02-27 19:32:30.295749847 +0100 +@@ -66,6 +66,9 @@ # AT91SAM9G45 board-specific support obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o @@ -484,9 +469,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/ar # AT91CAP9 board-specific support obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o -diff -Nur linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c linux-2.6.32.2/drivers/mmc/host/at91_mci.c ---- linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c 2009-12-18 23:27:07.000000000 +0100 -+++ linux-2.6.32.2/drivers/mmc/host/at91_mci.c 2010-02-23 21:18:53.000000000 +0100 +diff -Nur linux-2.6.33.orig/drivers/mmc/host/at91_mci.c linux-2.6.33/drivers/mmc/host/at91_mci.c +--- linux-2.6.33.orig/drivers/mmc/host/at91_mci.c 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/drivers/mmc/host/at91_mci.c 2010-02-27 19:32:30.295749847 +0100 @@ -461,7 +461,7 @@ at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC); mr = AT91_MCI_PDCMODE | 0x34a; diff --git a/target/foxg20/target.mk b/target/foxg20/target.mk index 5a7e677d7..0a6a7cb34 100644 --- a/target/foxg20/target.mk +++ b/target/foxg20/target.mk @@ -1,8 +1,8 @@ # arm default is little endian, this target uses EABI ARCH:= arm CPU_ARCH:= arm -KERNEL_VERSION:= 2.6.32.2 +KERNEL_VERSION:= 2.6.33 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 +KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=armv5te -mtune=arm926ej-s -- cgit v1.2.3 From 58d5b9279d9c28e0acd5bde9f9e02a001ac2c736 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2010 22:26:39 +0100 Subject: update lemote target to 2.6.33 - fix libc-dev packages - fix cryptinit target --- TODO | 4 +- package/cryptinit/Makefile | 3 + package/eglibc/Makefile | 4 +- package/glibc/Makefile | 4 +- package/uclibc/Makefile | 4 +- target/Config.in | 17 +- target/lemote/Makefile | 35 ++-- target/lemote/kernel.config | 326 ++++++++++++++++++++++++----------- target/lemote/target.mk | 4 +- target/linux/config/Config.in.kernel | 4 + target/linux/config/Config.in.misc | 1 + target/qemu-arm/Makefile | 4 +- 12 files changed, 269 insertions(+), 141 deletions(-) diff --git a/TODO b/TODO index 5b7cb4fe8..e5a2e98e2 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,7 @@ -- update to 2.6.33 -- microsd filesystem for foxg20 +- fix glibc build for MIPS targets - implement update for MTD devices (ag241) - fix watchdog for alix1c (mfgpt timers problem) - macos x build -- use LZMA kernels for MIPS targets - package drbd - new packages for openais and pacemaker - continuos build via hudson or sth. like that diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 0366fa2ef..c9298e15d 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -15,6 +15,8 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk +$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -35,5 +37,6 @@ do-build: do-install: $(CP) ./files/initramfs_list $(LINUX_DIR) $(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR) + @touch ${IDIR_CRYPTINIT}/.empty include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 932871dcf..5c3c76899 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -73,13 +73,13 @@ eglibc-dev-install: cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so # header package - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ ${EGLIBC_ENV} \ - $(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \ + $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \ --prefix=$(IDIR_EGLIBC_DEV)/usr \ --with-headers=$(IDIR_EGLIBC_DEV)/usr/include \ ${EGLIBC_CONFOPTS} \ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index ddda531a9..084a71918 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -57,12 +57,12 @@ glibc-dev-install: ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib # header package - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ - $(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \ + $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \ --prefix=/usr \ --with-sysroot=$(IDIR_GLIBC_DEV) \ ${GLIBC_CONFOPTS} \ diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index aeffb3563..787dc4e56 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -41,10 +41,10 @@ uclibc-dev-install: ${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib # header package - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \ headers_install - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ PREFIX=$(IDIR_UCLIBC_DEV)/ \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \ diff --git a/target/Config.in b/target/Config.in index cb4f04d01..dc212d0ee 100644 --- a/target/Config.in +++ b/target/Config.in @@ -760,8 +760,6 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ - ADK_LINUX_ARM_TOMTOM || \ - ADK_LINUX_ARM_G1 || \ ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_TOOLCHAIN help @@ -771,24 +769,13 @@ config ADK_TARGET_LIB_GLIBC bool "GNU C library" select ADK_glibc depends on ADK_LINUX_X86_QEMU || \ - ADK_LINUX_ARM_QEMU || \ - ADK_LINUX_MIPS_QEMU || \ - ADK_LINUX_MIPS64_QEMU || \ - ADK_LINUX_MIPSEL_QEMU || \ - ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_64_QEMU || \ ADK_LINUX_X86_ALIX1C || \ ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_ALIX2D13 || \ ADK_LINUX_X86_WRAP || \ - ADK_LINUX_MIPS_RB411 || \ - ADK_LINUX_MIPS_RB433 || \ - ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_RESCUE || \ ADK_LINUX_X86_64_SHUTTLE || \ - ADK_LINUX_ARM_TOMTOM || \ - ADK_LINUX_ARM_G1 || \ - ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_TOOLCHAIN help http://www.gnu.org/libc @@ -811,7 +798,9 @@ config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" depends on \ ADK_LINUX_QEMU || \ + ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_NATIVE || \ + ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_RESCUE select ADK_KERNEL_BLK_DEV_INITRD help @@ -824,6 +813,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK ADK_LINUX_QEMU || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_NATIVE || \ + ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_RESCUE help create an read-only initramfs system. @@ -974,7 +964,6 @@ endchoice choice prompt "Compression method for Kernel" - depends on ADK_LINUX_QEMU || ADK_LINUX_ALIX depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK) config ADK_TARGET_KERNEL_COMPRESSION_GZIP diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 951d0b3cc..e93f13b4a 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -7,33 +7,41 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id - kernel-install: - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel createinit: + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE) + $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \ + $(LINUX_DIR)/.config + echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ + CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ + CC="$(TARGET_CC)" $(MAKE_TRACE) + @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + +createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config - $(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ + echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ + CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) - $(CP) $(LINUX_DIR)/arch/mips/loongson/image/vmlinuz \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' @echo 'PMON> ifaddr rtl0 ' @echo 'PMON> load tftp:///${ADK_TARGET}-${FS}-kernel' - @echo 'PMON> g no_auto_cmd root=/dev/nfs ip=dhcp init=/init' + @echo 'PMON> g' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),encrypted) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit +imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinitcrypt @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo 'Boot your lemote via NFS or USB.' @@ -62,11 +70,16 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) +imageinstall: $(BIN_DIR)/$(INITRAMFS) createinit @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif +ifeq ($(FS),initramfs-piggyback) +imageinstall: $(BIN_DIR)/$(INITRAMFS) createinit + @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'Login as user root with password linux123 via ssh or console' +endif ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index 522126f87..a8e30edc9 100644 --- a/target/lemote/kernel.config +++ b/target/lemote/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30.5 -# Sun Aug 23 20:23:04 2009 +# Linux kernel version: 2.6.33 +# Sat Feb 27 10:09:18 2010 # CONFIG_MIPS=y @@ -9,8 +9,9 @@ CONFIG_MIPS=y # Machine selection # # CONFIG_MACH_ALCHEMY is not set -# CONFIG_BASLER_EXCITE is not set +# CONFIG_AR7 is not set # CONFIG_BCM47XX is not set +# CONFIG_BCM63XX is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set @@ -26,6 +27,7 @@ CONFIG_MACH_LOONGSON=y # CONFIG_PNX8550_STB810 is not set # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set +# CONFIG_POWERTV is not set # CONFIG_SGI_IP22 is not set # CONFIG_SGI_IP27 is not set # CONFIG_SGI_IP28 is not set @@ -45,14 +47,14 @@ CONFIG_MACH_LOONGSON=y # CONFIG_WR_PPMC is not set # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set +# CONFIG_ALCHEMY_GPIO_INDIRECT is not set CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_LEMOTE_FULOONG2E is not set -# CONFIG_LEMOTE_FULOONG2F is not set -CONFIG_LEMOTE_YEELOONG2F=y +CONFIG_LEMOTE_MACH2F=y CONFIG_CS5536=y -CONFIG_SYS_HAS_MACH_PROM_INIT_CMDLINE=y CONFIG_CS5536_MFGPT=y -CONFIG_UCA_SIZE=0x400000 +CONFIG_LOONGSON_SUSPEND=y +CONFIG_LOONGSON_UART_BASE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set @@ -67,9 +69,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y -CONFIG_EARLY_PRINTK=y CONFIG_SYS_HAS_EARLY_PRINTK=y -# CONFIG_HOTPLUG_CPU is not set CONFIG_I8259=y # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_ISA_DMA=y @@ -107,12 +107,17 @@ CONFIG_CPU_LOONGSON2F=y # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set # CONFIG_CPU_CAVIUM_OCTEON is not set +CONFIG_SYS_SUPPORTS_ZBOOT=y +CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y CONFIG_CPU_LOONGSON2=y CONFIG_SYS_HAS_CPU_LOONGSON2F=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_CPUFREQ=y +CONFIG_CPU_SUPPORTS_ADDRWINCFG=y +CONFIG_CPU_SUPPORTS_UNCACHED_ACCELERATED=y # # Kernel type @@ -134,7 +139,6 @@ CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_SYS_SUPPORTS_HIGHMEM=y -CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set @@ -143,18 +147,12 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y - -# -# Memory hotplug is currently incompatible with Software Suspend -# CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y @@ -177,6 +175,7 @@ CONFIG_PREEMPT_VOLUNTARY=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y # # General setup @@ -189,9 +188,11 @@ CONFIG_LOCALVERSION="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set CONFIG_KERNEL_LZMA=y +# CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -204,11 +205,13 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=64 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=15 # CONFIG_GROUP_SCHED is not set @@ -216,11 +219,7 @@ CONFIG_LOG_BUF_SHIFT=15 # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_RD_GZIP is not set -# CONFIG_RD_BZIP2 is not set -CONFIG_RD_LZMA=y +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -228,7 +227,6 @@ CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set -# CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -242,25 +240,32 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_VM_EVENT_COUNTERS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_SYSCALL_WRAPPERS=y + +# +# GCOV-based kernel profiling +# # CONFIG_SLOW_WORK is not set -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=1 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y @@ -272,15 +277,41 @@ CONFIG_BLOCK_COMPAT=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" -# CONFIG_PROBE_INITRD_HEADER is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y # @@ -321,8 +352,12 @@ CONFIG_PM=y CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATION_NVS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="/dev/mapper/swap" +# CONFIG_PM_RUNTIME is not set +CONFIG_MIPS_EXTERNAL_TIMER=y +CONFIG_MIPS_CPUFREQ=y # # CPU Frequency scaling @@ -342,7 +377,11 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_LOONGSON2F_CPU_FREQ=y + +# +# CPUFreq processor drivers +# +CONFIG_LOONGSON2_CPUFREQ=y CONFIG_NET=y # @@ -381,6 +420,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -395,6 +435,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -409,10 +450,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_OLD_REGULATORY is not set -# CONFIG_WIRELESS_EXT is not set # CONFIG_LIB80211 is not set -# CONFIG_MAC80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -425,6 +467,8 @@ CONFIG_WIRELESS=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set @@ -447,6 +491,10 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set @@ -477,10 +525,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set @@ -500,6 +544,7 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y # CONFIG_SATA_PMP is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -521,6 +566,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_ALI is not set CONFIG_PATA_AMD=y # CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set @@ -548,15 +594,17 @@ CONFIG_PATA_AMD=y # CONFIG_PATA_NS87415 is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_QDI is not set # CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set # CONFIG_PATA_WINBOND_VLB is not set @@ -570,13 +618,16 @@ CONFIG_PATA_AMD=y # # -# Enable only one of the two stacks, unless you know what you are doing +# You can enable one or both FireWire driver stacks. +# + +# +# The newer stack is recommended. # # CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set # CONFIG_I2O is not set CONFIG_NETDEVICES=y -CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set @@ -597,6 +648,7 @@ CONFIG_MII=y # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set # CONFIG_ETHOC is not set +# CONFIG_SMSC911X is not set # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_DNET is not set # CONFIG_NET_TULIP is not set @@ -637,18 +689,15 @@ CONFIG_8139TOO_TUNE_TWISTER=y # CONFIG_SMSC9420 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set # CONFIG_VIA_RHINE is not set # CONFIG_SC92031 is not set # CONFIG_ATL2 is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set - -# -# Wireless LAN -# -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +# CONFIG_WLAN is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -671,6 +720,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -680,6 +730,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set # CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set # # Userland interfaces @@ -697,11 +748,12 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600 # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_PS2_ALPS is not set @@ -709,6 +761,7 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_PS2_SYNAPTICS is not set # CONFIG_MOUSE_PS2_TRACKPOINT is not set # CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_APPLETOUCH is not set @@ -731,6 +784,7 @@ CONFIG_SERIO_I8042=y # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_GAMEPORT is not set # @@ -741,7 +795,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set @@ -765,8 +819,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=y -# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM is not set # CONFIG_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -776,11 +829,15 @@ CONFIG_HW_RANDOM=y CONFIG_DEVPORT=y # CONFIG_I2C is not set # CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y @@ -797,31 +854,17 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set # CONFIG_REGULATOR is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set # # Graphics support # +# CONFIG_VGA_ARB is not set # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y +# CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=y @@ -867,9 +910,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set -CONFIG_FB_SM7XX=y -CONFIG_FB_SM7XX_ACCEL=y -# CONFIG_FB_SM7XX_DUALHEAD is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -877,7 +917,7 @@ CONFIG_FB_SM7XX_ACCEL=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y +# CONFIG_BACKLIGHT_GENERIC is not set # # Display device support @@ -903,7 +943,6 @@ CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -# CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set # @@ -947,12 +986,14 @@ CONFIG_USB_SUSPEND=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set @@ -1032,10 +1073,45 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set -# CONFIG_STAGING is not set -CONFIG_LOONGSON_PLATFORM_DEVICES=y -CONFIG_EC_KB3310B=y -# CONFIG_EC_KB3310B_DEBUG is not set + +# +# TI VLYNQ +# +CONFIG_STAGING=y +# CONFIG_STAGING_EXCLUDE_BUILD is not set +# CONFIG_USB_IP_COMMON is not set +# CONFIG_ECHO is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_ALTERA_PCIE_CHDMA is not set +# CONFIG_INPUT_MIMIO is not set +# CONFIG_TRANZPORT is not set + +# +# Qualcomm MSM Camera And Video +# + +# +# Camera Sensor Selection +# +# CONFIG_INPUT_GPIO is not set +# CONFIG_POHMELFS is not set +# CONFIG_B3DFG is not set +# CONFIG_IDE_PHISON is not set +# CONFIG_PLAN9AUTH is not set +# CONFIG_FB_UDL is not set +# CONFIG_VME_BUS is not set + +# +# RAR Register Driver +# +# CONFIG_RAR_REGISTER is not set +# CONFIG_IIO is not set +# CONFIG_RAMZSWAP is not set +# CONFIG_BATMAN_ADV is not set +# CONFIG_STRIP is not set +CONFIG_FB_SM7XX=y +# CONFIG_FB_SM7XX_ACCEL is not set # # File systems @@ -1050,9 +1126,13 @@ CONFIG_EC_KB3310B=y # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1103,7 +1183,46 @@ CONFIG_NETWORK_FILESYSTEMS=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_NLS is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set # CONFIG_DLM is not set # @@ -1115,6 +1234,7 @@ CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -1122,23 +1242,19 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_TRACING_SUPPORT=y - -# -# Tracers -# -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_EVENT_TRACER is not set -# CONFIG_BOOT_TRACER is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_FTRACE is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_CMDLINE="" +CONFIG_EARLY_PRINTK=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=tty0 init=/init no_auto_cmd" +CONFIG_CMDLINE_OVERRIDE=y # # Security options @@ -1146,13 +1262,16 @@ CONFIG_CMDLINE="" # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -1184,11 +1303,13 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -1252,7 +1373,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set -CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/target/lemote/target.mk b/target/lemote/target.mk index db804bc64..7293e785e 100644 --- a/target/lemote/target.mk +++ b/target/lemote/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.32 +KERNEL_VERSION:= 2.6.33 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 +KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 806f95d45..02ddd2d04 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -2,6 +2,10 @@ config ADK_KERNEL_BLK_DEV_INITRD bool default n +config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE + bool + default n + config ADK_KERNEL_RD_GZIP bool default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 597b0c704..71c07e553 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -1,5 +1,6 @@ config ADK_LINUX_INITRAMFS_BUILTIN select ADK_KERNEL_BLK_DEV_INITRD + select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE boolean default n diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile index 60db4981d..4a423a6ef 100644 --- a/target/qemu-arm/Makefile +++ b/target/qemu-arm/Makefile @@ -14,8 +14,8 @@ kernel-install: createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE) $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config - #echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config - #echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config echo N |$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ -- cgit v1.2.3 From 4db531872ce8e489cf036526975d8f73c8b20a88 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2010 22:27:29 +0100 Subject: remove old patch, yeelong support is included upstream --- target/lemote/patches/yeelong.patch | 57994 ---------------------------------- 1 file changed, 57994 deletions(-) delete mode 100644 target/lemote/patches/yeelong.patch diff --git a/target/lemote/patches/yeelong.patch b/target/lemote/patches/yeelong.patch deleted file mode 100644 index 5909a579e..000000000 --- a/target/lemote/patches/yeelong.patch +++ /dev/null @@ -1,57994 +0,0 @@ -diff -Nur linux-2.6.30.5.orig/arch/mips/configs/fulong_defconfig linux-2.6.30.5/arch/mips/configs/fulong_defconfig ---- linux-2.6.30.5.orig/arch/mips/configs/fulong_defconfig 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/arch/mips/configs/fulong_defconfig 1970-01-01 01:00:00.000000000 +0100 -@@ -1,1912 +0,0 @@ --# --# Automatically generated make config: don't edit --# Linux kernel version: 2.6.28-rc6 --# Fri Nov 28 17:53:48 2008 --# --CONFIG_MIPS=y -- --# --# Machine selection --# --# CONFIG_MACH_ALCHEMY is not set --# CONFIG_BASLER_EXCITE is not set --# CONFIG_BCM47XX is not set --# CONFIG_MIPS_COBALT is not set --# CONFIG_MACH_DECSTATION is not set --# CONFIG_MACH_JAZZ is not set --# CONFIG_LASAT is not set --CONFIG_LEMOTE_FULONG=y --# CONFIG_MIPS_MALTA is not set --# CONFIG_MIPS_SIM is not set --# CONFIG_MACH_EMMA is not set --# CONFIG_MACH_VR41XX is not set --# CONFIG_NXP_STB220 is not set --# CONFIG_NXP_STB225 is not set --# CONFIG_PNX8550_JBS is not set --# CONFIG_PNX8550_STB810 is not set --# CONFIG_PMC_MSP is not set --# CONFIG_PMC_YOSEMITE is not set --# CONFIG_SGI_IP22 is not set --# CONFIG_SGI_IP27 is not set --# CONFIG_SGI_IP28 is not set --# CONFIG_SGI_IP32 is not set --# CONFIG_SIBYTE_CRHINE is not set --# CONFIG_SIBYTE_CARMEL is not set --# CONFIG_SIBYTE_CRHONE is not set --# CONFIG_SIBYTE_RHONE is not set --# CONFIG_SIBYTE_SWARM is not set --# CONFIG_SIBYTE_LITTLESUR is not set --# CONFIG_SIBYTE_SENTOSA is not set --# CONFIG_SIBYTE_BIGSUR is not set --# CONFIG_SNI_RM is not set --# CONFIG_MACH_TX39XX is not set --# CONFIG_MACH_TX49XX is not set --# CONFIG_MIKROTIK_RB532 is not set --# CONFIG_WR_PPMC is not set --CONFIG_RWSEM_GENERIC_SPINLOCK=y --# CONFIG_ARCH_HAS_ILOG2_U32 is not set --# CONFIG_ARCH_HAS_ILOG2_U64 is not set --CONFIG_ARCH_SUPPORTS_OPROFILE=y --CONFIG_GENERIC_FIND_NEXT_BIT=y --CONFIG_GENERIC_HWEIGHT=y --CONFIG_GENERIC_CALIBRATE_DELAY=y --CONFIG_GENERIC_CLOCKEVENTS=y --CONFIG_GENERIC_TIME=y --CONFIG_GENERIC_CMOS_UPDATE=y --CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y --CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y --CONFIG_CEVT_R4K=y --CONFIG_CSRC_R4K=y --CONFIG_DMA_NONCOHERENT=y --CONFIG_DMA_NEED_PCI_MAP_STATE=y --CONFIG_EARLY_PRINTK=y --CONFIG_SYS_HAS_EARLY_PRINTK=y --# CONFIG_HOTPLUG_CPU is not set --CONFIG_I8259=y --# CONFIG_NO_IOPORT is not set --CONFIG_GENERIC_ISA_DMA=y --CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y --# CONFIG_CPU_BIG_ENDIAN is not set --CONFIG_CPU_LITTLE_ENDIAN=y --CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y --CONFIG_IRQ_CPU=y --CONFIG_BOOT_ELF32=y --CONFIG_MIPS_L1_CACHE_SHIFT=5 --CONFIG_HAVE_STD_PC_SERIAL_PORT=y -- --# --# CPU selection --# --CONFIG_CPU_LOONGSON2=y --# CONFIG_CPU_MIPS32_R1 is not set --# CONFIG_CPU_MIPS32_R2 is not set --# CONFIG_CPU_MIPS64_R1 is not set --# CONFIG_CPU_MIPS64_R2 is not set --# CONFIG_CPU_R3000 is not set --# CONFIG_CPU_TX39XX is not set --# CONFIG_CPU_VR41XX is not set --# CONFIG_CPU_R4300 is not set --# CONFIG_CPU_R4X00 is not set --# CONFIG_CPU_TX49XX is not set --# CONFIG_CPU_R5000 is not set --# CONFIG_CPU_R5432 is not set --# CONFIG_CPU_R5500 is not set --# CONFIG_CPU_R6000 is not set --# CONFIG_CPU_NEVADA is not set --# CONFIG_CPU_R8000 is not set --# CONFIG_CPU_R10000 is not set --# CONFIG_CPU_RM7000 is not set --# CONFIG_CPU_RM9000 is not set --# CONFIG_CPU_SB1 is not set --CONFIG_SYS_HAS_CPU_LOONGSON2=y --CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y --CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y --CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y --CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y -- --# --# Kernel type --# --# CONFIG_32BIT is not set --CONFIG_64BIT=y --# CONFIG_PAGE_SIZE_4KB is not set --# CONFIG_PAGE_SIZE_8KB is not set --CONFIG_PAGE_SIZE_16KB=y --# CONFIG_PAGE_SIZE_64KB is not set --CONFIG_BOARD_SCACHE=y --CONFIG_MIPS_MT_DISABLED=y --# CONFIG_MIPS_MT_SMP is not set --# CONFIG_MIPS_MT_SMTC is not set --CONFIG_CPU_HAS_WB=y --CONFIG_CPU_HAS_SYNC=y --CONFIG_GENERIC_HARDIRQS=y --CONFIG_GENERIC_IRQ_PROBE=y --CONFIG_CPU_SUPPORTS_HIGHMEM=y --CONFIG_SYS_SUPPORTS_HIGHMEM=y --CONFIG_ARCH_FLATMEM_ENABLE=y --CONFIG_ARCH_POPULATES_NODE_MAP=y --CONFIG_ARCH_SPARSEMEM_ENABLE=y --CONFIG_SELECT_MEMORY_MODEL=y --CONFIG_FLATMEM_MANUAL=y --# CONFIG_DISCONTIGMEM_MANUAL is not set --# CONFIG_SPARSEMEM_MANUAL is not set --CONFIG_FLATMEM=y --CONFIG_FLAT_NODE_MEM_MAP=y --CONFIG_SPARSEMEM_STATIC=y --CONFIG_PAGEFLAGS_EXTENDED=y --CONFIG_SPLIT_PTLOCK_CPUS=4 --CONFIG_RESOURCES_64BIT=y --CONFIG_PHYS_ADDR_T_64BIT=y --CONFIG_ZONE_DMA_FLAG=0 --CONFIG_VIRT_TO_BUS=y --CONFIG_UNEVICTABLE_LRU=y --CONFIG_TICK_ONESHOT=y --CONFIG_NO_HZ=y --CONF