From cc98a1833bbdfbba3ccda5eb30310ed0d7bfbdd5 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 6 Apr 2009 01:09:46 +0200 Subject: initramfs-kexecboot-image: fix EXTRA_IMAGEDEPENDS for c7x0/akita/spitz --- conf/machine/include/zaurus-clamshell.inc | 2 ++ recipes/kexecboot/initramfs-kexecboot-image.bb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 1421630e80..df4e243eef 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -3,6 +3,8 @@ include conf/machine/include/tune-xscale.inc UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" + +LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700" EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 7fc2b79d04..1aacceaa30 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,7 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" -EXTRA_IMAGEDEPENDS = "" +#EXTRA_IMAGEDEPENDS = "" +EXTRA_IMAGEDEPENDS = "${LEGACY_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" IMAGE_LINGUAS = "" -- cgit v1.2.3 From 1292d50926c3a412c7c4e8720170f493a0f5ab8e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 5 Apr 2009 21:08:58 -0500 Subject: SlugOS: leds - attempt to modload ledtrig-timer rather than assuming it is built into the kernel. (From Martin Michlmayr) --- recipes/slugos-init/files/leds | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/slugos-init/files/leds b/recipes/slugos-init/files/leds index b40d5d874e..68f0c23a98 100644 --- a/recipes/slugos-init/files/leds +++ b/recipes/slugos-init/files/leds @@ -31,6 +31,8 @@ led_set(){ esac >"$1/brightness";; slow|fast|panic|blink|flash) + modprobe ledtrig-timer > /dev/null 2>&1 || true + echo -n timer case "$setting" in -- cgit v1.2.3 From 26b1e968669865d31ed0b53d048d989e93519e45 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 5 Apr 2009 22:05:27 -0500 Subject: SlugOS: leds - fix logic to attempt to beep even if udev hasn't yet run. --- recipes/slugos-init/files/leds | 5 +++++ recipes/slugos-init/slugos-init_5.0.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/slugos-init/files/leds b/recipes/slugos-init/files/leds index 68f0c23a98..b1f6e126b4 100644 --- a/recipes/slugos-init/files/leds +++ b/recipes/slugos-init/files/leds @@ -198,6 +198,11 @@ beep(){ break fi done + # If udev hasn't run, then /dev/input doesn't exist, so + # fallback to /dev/buzzer if possible. + if test -e /dev/buzzer -a ! -d /dev/input; then + arg="-e /dev/buzzer" + fi /bin/beep $arg "$@" 2>/dev/null fi return 0 diff --git a/recipes/slugos-init/slugos-init_5.0.bb b/recipes/slugos-init/slugos-init_5.0.bb index beeaa34135..bf3bb6fee8 100644 --- a/recipes/slugos-init/slugos-init_5.0.bb +++ b/recipes/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r10" +PR = "r11" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 45c1142d3e0fc422277cf4671613aa9b61bf010f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 5 Apr 2009 23:35:38 -0500 Subject: SlugOS: toolchain/sdk - add a number of missing components provided by task-sdk-bare, as noted by Tom Rini. --- recipes/tasks/task-slugos-toolchain-target.bb | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/recipes/tasks/task-slugos-toolchain-target.bb b/recipes/tasks/task-slugos-toolchain-target.bb index 489a41213b..fb0418fe29 100644 --- a/recipes/tasks/task-slugos-toolchain-target.bb +++ b/recipes/tasks/task-slugos-toolchain-target.bb @@ -2,31 +2,21 @@ DESCRIPTION = "Packages for a standalone SDK or external toolchain" LICENSE = "MIT" ALLOW_EMPTY = "1" -PR = "r1" +PR = "r3" PACKAGES = "${PN}" -# Stuff contained in this SDK is largely taken from task-sdk-base.bb. +DEPENDS = "task-sdk-bare" + # This is a starting point, and nothing more at present -- please fill # this out with a reasonable set of development tools for a SlugOS image. # Also feel free to remove stuff that's silly. RDEPENDS_${PN} = "\ - libgcc \ + task-sdk-bare \ linux-libc-headers-dev \ libssl \ libcrypto \ openssl-dev \ - libstdc++ \ - " - -# Not sure if we need these or not... -NOT_SURE_ABOUT = "\ - libsegfault \ - " - -# This one needs further investigation; seems to be some sort -# of naming problem that breaks the SDK when it is added directly. -ODDLY_BROKEN_PACKAGES ="\ - libz-dev \ + zlib-dev \ " -- cgit v1.2.3 From 389043beaee17cd6bc90e5c8e7140fdab51c9ae8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Apr 2009 08:56:14 +0200 Subject: kernel,module-base class, bitbake.conf: introduce MACHINE_KERNEL_PR * bandaid till we have a better way to track ABI changes --- classes/kernel.bbclass | 4 ++++ classes/module-base.bbclass | 4 ++++ conf/bitbake.conf | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 17e8941745..954c407d51 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -64,6 +64,10 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" +# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force +# rebuilds for kernel and external modules +PR = "${MACHINE_KERNEL_PR}" + KERNEL_LOCALVERSION ?= "" # kernels are generally machine specific diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index c98baceeab..bc53e1bad5 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -5,6 +5,10 @@ inherit kernel-arch export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" +# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force +# rebuilds for kernel and external modules +PR = "${MACHINE_KERNEL_PR}" + export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a0d652a26d..136f01c228 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -162,6 +162,10 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}" P = "${PN}-${PV}" +# Define a PR for kernels that machines can override so things like +# modules get rebuilt +MACHINE_KERNEL_PR ?= "r0" + # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P -- cgit v1.2.3 From 594a5295448cfc2d97e9b1721efe57c3362635bf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Apr 2009 09:11:49 +0200 Subject: omap3 boards: introduce MACHINE_KERNEL_PR, put it in conf/machine/include/omap3.inc --- conf/machine/beagleboard.conf | 14 ++------------ conf/machine/include/omap3.inc | 12 ++++++++++++ conf/machine/omap3-pandora.conf | 7 +------ conf/machine/omap3evm.conf | 8 +------- conf/machine/overo.conf | 7 +------ recipes/dsplink/gstreamer-ti_svn.bb | 2 +- recipes/dsplink/ti-codec-engine_2.21.bb | 1 - recipes/dsplink/ti-codec-engine_2.23.bb | 1 - recipes/dsplink/ti-dmai_svn.bb | 2 +- recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb | 2 -- 10 files changed, 19 insertions(+), 37 deletions(-) create mode 100644 conf/machine/include/omap3.inc diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 78c63019ae..69cdec6f1f 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -13,23 +13,14 @@ XSERVER = "xserver-xorg \ # Only has DVI connector for external screen GUI_MACHINE_CLASS = "bigscreen" -#include conf/machine/include/tune-arm1136jf-s.inc -# requires gcc 4.3.0: -include conf/machine/include/tune-cortexa8.inc +require conf/machine/include/omap3.inc - -IMAGE_FSTYPES += "tar.bz2 jffs2" +IMAGE_FSTYPES += "tar.bz2 ubi" EXTRA_IMAGECMD_jffs2 = "-lnp " # Guesswork SERIAL_CONSOLE = "115200 ttyS2" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" - -KERNEL_IMAGETYPE = "uImage" - -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" UBOOT_MACHINE = "omap3_beagle_config" # do ubiattach /dev/ubi_ctrl -m 4 @@ -49,7 +40,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" -EXTRA_IMAGEDEPENDS += "u-boot x-load" MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " # and sdio diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc new file mode 100644 index 0000000000..f6cf895c52 --- /dev/null +++ b/conf/machine/include/omap3.inc @@ -0,0 +1,12 @@ +require conf/machine/include/tune-cortexa8.inc +PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +MACHINE_KERNEL_PR = "r20" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + +EXTRA_IMAGEDEPENDS += "u-boot x-load" + +MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index 5bfbb712f2..99d92d5512 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console TARGET_ARCH = "arm" -include conf/machine/include/tune-cortexa8.inc +require conf/machine/include/omap3.inc PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -28,12 +28,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" -#KERNEL_IMAGETYPE = "uImage" - -#UBOOT_ENTRYPOINT = "0x80008000" -#UBOOT_LOADADDRESS = "0x80008000" #UBOOT_ARCH = "arm" #UBOOT_MACHINE = "omap3_pandora_config" diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index 610b1dfc12..8780b827f5 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -13,9 +13,7 @@ XSERVER = "xserver-xorg \ GUI_MACHINE_CLASS = "smallscreen" -#include conf/machine/include/tune-arm1136jf-s.inc -# requires gcc 4.3.0: -include conf/machine/include/tune-cortexa8.inc +require conf/machine/include/omap3.inc # Ship all kernel modules MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" @@ -27,10 +25,6 @@ SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm" -KERNEL_IMAGETYPE = "uImage" - -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf index 2a93ab069d..cb32539928 100644 --- a/conf/machine/overo.conf +++ b/conf/machine/overo.conf @@ -2,18 +2,13 @@ #@NAME: overo machine #@DESCRIPTION: Machine configuration for the Gumstix Overo -include conf/machine/include/tune-cortexa8.inc +require conf/machine/include/omap3.inc TARGET_ARCH = "arm" MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" UBOOT_MACHINE_overo = "omap3_overo_config" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" - -KERNEL_IMAGETYPE = "uImage" SERIAL_CONSOLE = "115200 ttyS2" IMAGE_FSTYPES += "tar.bz2" diff --git a/recipes/dsplink/gstreamer-ti_svn.bb b/recipes/dsplink/gstreamer-ti_svn.bb index ab705f3622..6944ad59b8 100644 --- a/recipes/dsplink/gstreamer-ti_svn.bb +++ b/recipes/dsplink/gstreamer-ti_svn.bb @@ -4,7 +4,7 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto= " SRCREV = "160" -PR = "r7" +PR = "${MACHINE_KERNEL_PR}" # Again, no '.' in PWD allowed :( PV = "0+svnr${SRCREV}" diff --git a/recipes/dsplink/ti-codec-engine_2.21.bb b/recipes/dsplink/ti-codec-engine_2.21.bb index 5b1d5e0b6b..f0b0d7e1ce 100644 --- a/recipes/dsplink/ti-codec-engine_2.21.bb +++ b/recipes/dsplink/ti-codec-engine_2.21.bb @@ -8,7 +8,6 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r19" PV = "221" # Get CE tarball from TI website, place in sources and calculate diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb index a42c33bcdd..bbf54d4ff9 100644 --- a/recipes/dsplink/ti-codec-engine_2.23.bb +++ b/recipes/dsplink/ti-codec-engine_2.23.bb @@ -9,7 +9,6 @@ inherit module DEFAULT_PREFERENCE = "-1" # tconf from xdctools dislikes '.' in pwd :/ -PR = "r0" PV = "223" # Get CE tarball from TI website, place in sources and calculate md5sum diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb index bcbaea8f65..76fa74a258 100644 --- a/recipes/dsplink/ti-dmai_svn.bb +++ b/recipes/dsplink/ti-dmai_svn.bb @@ -15,7 +15,7 @@ SRCREV = "36" S = "${WORKDIR}/BRIJESH_GIT_022309/davinci_multimedia_application_interface/dmai" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "120+svnr${SRCREV}" -PR = "r16" +PR = "${MACHINE_KERNEL_PR}" TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb index 985a0c044b..fc9f02f5df 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb @@ -1,8 +1,6 @@ DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs" LICENSE = "GPLv2" -PR = "r6" - inherit module SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-${PV}.tar.bz2 \ -- cgit v1.2.3 From 0289d87d39d3b77c70c948a248d94f565ee71029 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 13 Mar 2009 20:44:02 +0100 Subject: Add support for AT91SAM9G20EK --- conf/machine/at91sam9g20ek.conf | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 conf/machine/at91sam9g20ek.conf diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf new file mode 100644 index 0000000000..8a56e3b498 --- /dev/null +++ b/conf/machine/at91sam9g20ek.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9G20EK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9g20ek development board with a at91sam9g20 processor + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.28" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_u-boot = "2009.01" +UBOOT_MACHINE = "at92sam9g20ek_config" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" +#EXTRA_IMAGEDEPENDS += "u-boot" +#EXTRA_IMAGEDEPENDS += "at91bootstrap" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc -- cgit v1.2.3 From 038dd6020c471b8cc9684de38a610ea5326a09f5 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 13 Mar 2009 20:43:30 +0100 Subject: Add support for at91cap9adk development board with a at91cap9500 processor --- conf/machine/at91cap9adk.conf | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 conf/machine/at91cap9adk.conf diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf new file mode 100644 index 0000000000..3512d19744 --- /dev/null +++ b/conf/machine/at91cap9adk.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@Name: Atmel AT91CAP9ADK Development Platform +#@DESCRIPTION: Machine configuration for the at91cap9adk development board with a at91cap9500 processor + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.28" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_u-boot = "2009.01" +UBOOT_MACHINE = "at91cap9adk_config" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" +EXTRA_IMAGEDEPENDS += "u-boot" +#EXTRA_IMAGEDEPENDS += "at91bootstrap" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc -- cgit v1.2.3 From b42626ddd44ce9f0062ada19c894e759934011c9 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 13 Mar 2009 20:44:24 +0100 Subject: Add support for AT91SAM9RL64 --- conf/machine/at91sam9rlek.conf | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 conf/machine/at91sam9rlek.conf diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf new file mode 100644 index 0000000000..06f942b1d3 --- /dev/null +++ b/conf/machine/at91sam9rlek.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9RLEK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9rlek development board with a at91sam9rl64 processor + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.28" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_u-boot = "2009.01" +UBOOT_MACHINE = "at92sam9rlek_config" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" +EXTRA_IMAGEDEPENDS += "u-boot" +#EXTRA_IMAGEDEPENDS += "at91bootstrap" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc + -- cgit v1.2.3 From 82f0e66ef890ef247af932524f66f5c63fedc5d2 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 13 Mar 2009 20:35:21 +0100 Subject: Add recipe for at91bootstrap-2.10 --- .../at91bootstrap-2.10/at91cap9adk/defconfig | 68 +++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9260ek/defconfig | 68 +++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9261ek/defconfig | 68 +++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9263ek/defconfig | 68 +++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9g20ek/defconfig | 70 ++++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9rlek/defconfig | 68 +++++++++++++++++++++ .../at91bootstrap-2.10/at91sam9xeek/defconfig | 68 +++++++++++++++++++++ recipes/at91bootstrap/at91bootstrap_2.10.bb | 26 ++++++++ 8 files changed, 504 insertions(+) create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91cap9adk/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9260ek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9261ek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9263ek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9rlek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap-2.10/at91sam9xeek/defconfig create mode 100644 recipes/at91bootstrap/at91bootstrap_2.10.bb diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91cap9adk/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91cap9adk/defconfig new file mode 100644 index 0000000000..169c58ea06 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91cap9adk/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:12:57 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91cap9adk" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +CONFIG_AT91CAP9ADK=y +CONFIG_CHIP="AT91CAP9" +CONFIG_BOARD="at91cap9adk" +CONFIG_MACH_TYPE="1442" +CONFIG_LINK_ADDR="0x000000" +CONFIG_TOP_OF_MEMORY="0x108000" +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +# CONFIG_SDRAM is not set +CONFIG_SDDRC=y +ALLOW_DATAFLASH=y +ALLOW_FLASH=y +# ALLOW_NANDFLASH is not set +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +DATAFLASHCARD_ON_CS0=y +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +CONFIG_DATAFLASHCARD=y +CONFIG_CARD_SUFFIX="card" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x73F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9260ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9260ek/defconfig new file mode 100644 index 0000000000..9f1d450d4e --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9260ek/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:12:18 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9260ek" +CONFIG_AT91SAM9260EK=y +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9260" +CONFIG_BOARD="at91sam9260ek" +CONFIG_MACH_TYPE="0x44B" +CONFIG_LINK_ADDR="0x200000" +CONFIG_TOP_OF_MEMORY="0x301000" +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +DATAFLASHCARD_ON_CS0=y +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +CONFIG_DATAFLASHCARD=y +CONFIG_CARD_SUFFIX="card" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9261ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9261ek/defconfig new file mode 100644 index 0000000000..3e8824d1d4 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9261ek/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:16:48 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9261ek" +# CONFIG_AT91SAM9260EK is not set +CONFIG_AT91SAM9261EK=y +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9261" +CONFIG_BOARD="at91sam9261ek" +CONFIG_MACH_TYPE="0x350" +CONFIG_LINK_ADDR="0x300000" +CONFIG_TOP_OF_MEMORY="0x328000" +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +# DATAFLASHCARD_ON_CS0 is not set +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +# CONFIG_DATAFLASHCARD is not set +CONFIG_CARD_SUFFIX="" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9263ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9263ek/defconfig new file mode 100644 index 0000000000..9724ee2a30 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9263ek/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:11:38 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9263ek" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +CONFIG_AT91SAM9263EK=y +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9263" +CONFIG_BOARD="at91sam9263ek" +CONFIG_MACH_TYPE="0x4B2" +CONFIG_LINK_ADDR="0x300000" +CONFIG_TOP_OF_MEMORY="0x314000" +# CONFIG_CRYSTAL_16_000MHZ is not set +CONFIG_CRYSTAL_16_36766MHZ=y +# CONFIG_CRYSTAL_18_432MHZ is not set +CONFIG_CRYSTAL="CRYSTAL_16_36766MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +DATAFLASHCARD_ON_CS0=y +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +CONFIG_DATAFLASHCARD=y +CONFIG_CARD_SUFFIX="card" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig new file mode 100644 index 0000000000..7951ce28ea --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9g20ek/defconfig @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:13:52 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9g20ek" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +# CONFIG_AT91SAM9XEEK is not set +CONFIG_AT91SAM9G20EK=y +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9G20" +CONFIG_BOARD="at91sam9g20ek" +CONFIG_MACH_TYPE="0x658" +CONFIG_LINK_ADDR="0x200000" +CONFIG_TOP_OF_MEMORY="0x301000" +# CONFIG_BUS_SPEED_100MHZ is not set +CONFIG_BUS_SPEED_133MHZ=y +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +DATAFLASHCARD_ON_CS0=y +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +CONFIG_DATAFLASHCARD=y +CONFIG_CARD_SUFFIX="card" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9rlek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9rlek/defconfig new file mode 100644 index 0000000000..ca9a7962b6 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9rlek/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:14:48 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9rlek" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +CONFIG_AT91SAM9RLEK=y +# CONFIG_AT91SAM9XEEK is not set +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9RL" +CONFIG_BOARD="at91sam9rlek" +CONFIG_MACH_TYPE="1326" +CONFIG_LINK_ADDR="0x300000" +CONFIG_TOP_OF_MEMORY="0x310000" +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +# DATAFLASHCARD_ON_CS0 is not set +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +# CONFIG_DATAFLASHCARD is not set +CONFIG_CARD_SUFFIX="" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9xeek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9xeek/defconfig new file mode 100644 index 0000000000..298b53f4e4 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap-2.10/at91sam9xeek/defconfig @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Sat Dec 27 17:15:15 2008 +# +HAVE_DOT_CONFIG=y +CONFIG_BOARDNAME="at91sam9xeek" +# CONFIG_AT91SAM9260EK is not set +# CONFIG_AT91SAM9261EK is not set +# CONFIG_AT91SAM9263EK is not set +# CONFIG_AT91SAM9RLEK is not set +CONFIG_AT91SAM9XEEK=y +# CONFIG_AT91SAM9G20EK is not set +# CONFIG_AT91CAP9ADK is not set +CONFIG_CHIP="AT91SAM9XE" +CONFIG_BOARD="at91sam9xeek" +CONFIG_MACH_TYPE="0x44B" +CONFIG_LINK_ADDR="0x200000" +CONFIG_TOP_OF_MEMORY="0x301000" +# CONFIG_CRYSTAL_16_000MHZ is not set +# CONFIG_CRYSTAL_16_36766MHZ is not set +CONFIG_CRYSTAL_18_432MHZ=y +CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" + +# +# Memory selection +# +CONFIG_SDRAM=y +# CONFIG_SDDRC is not set +ALLOW_DATAFLASH=y +# ALLOW_FLASH is not set +ALLOW_NANDFLASH=y +# ALLOW_SDCARD is not set +CONFIG_DATAFLASH=y +# CONFIG_FLASH is not set +# CONFIG_NANDFLASH is not set +# CONFIG_SDCARD is not set +CONFIG_MEMORY="dataflash" + +# +# SPI configuration +# +CONFIG_SPI_CLK=33000000 +CONFIG_SPI_BOOT_CS0=y +# CONFIG_SPI_BOOT_CS1 is not set +DATAFLASHCARD_ON_CS0=y +# DATAFLASHCARD_ON_CS1 is not set +# DATAFLASHCARD_ON_CS2 is not set +# DATAFLASHCARD_ON_CS3 is not set +CONFIG_DATAFLASHCARD=y +CONFIG_CARD_SUFFIX="card" +CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" +CONFIG_SPI_MODE_0=y +# CONFIG_SPI_MODE_1 is not set +# CONFIG_SPI_MODE_2 is not set +# CONFIG_SPI_MODE_3 is not set +CONFIG_SPI_MODE=0 +CONFIG_PROJECT="dataflash" +CONFIG_LOAD_UBOOT=y +# CONFIG_LOAD_EXAMPLE is not set +# CONFIG_LOAD_SMALL_APP is not set +# CONFIG_LOAD_LARGE_APP is not set +CONFIG_IMG_ADDRESS="0x00008400" +CONFIG_IMG_SIZE="0x00040000" +CONFIG_JUMP_ADDR="0x23F00000" +CONFIG_APP_CHECK=y +# CONFIG_LONG_TEST is not set +CONFIG_DEBUG=y +CONFIG_HW_INIT=y diff --git a/recipes/at91bootstrap/at91bootstrap_2.10.bb b/recipes/at91bootstrap/at91bootstrap_2.10.bb new file mode 100644 index 0000000000..a652f1b155 --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap_2.10.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM" +SECTION = "bootloaders" + +SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ + file://defconfig \ + " + +AT91BOOTSTRAP_FLAGS ?= "" + +S = "${WORKDIR}/${PN}-${PV}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + rm -Rf ${S}/binaries + cp ${S}/../defconfig ${S}/.config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install +} + -- cgit v1.2.3 From 7753dd28919f32c5fbe31ddf60fe6d77f38b77df Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 13 Mar 2009 20:35:51 +0100 Subject: Add recipe for u-boot-2009.01 --- .../u-boot-2009.01-exp-001-config.patch | 266 +++++++ .../u-boot-2009.01-exp-002-at91sam9g20ek.patch | 802 +++++++++++++++++++++ ...u-boot-2009.01-exp-003-drivers-net-macb.c.patch | 28 + ...boot-2009.01-include_asm-avr32_io.h.patch.avr32 | 13 + recipes/u-boot/u-boot_2009.01.bb | 28 + 5 files changed, 1137 insertions(+) create mode 100644 recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-001-config.patch create mode 100644 recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-002-at91sam9g20ek.patch create mode 100644 recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-003-drivers-net-macb.c.patch create mode 100644 recipes/u-boot/u-boot-2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 create mode 100644 recipes/u-boot/u-boot_2009.01.bb diff --git a/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-001-config.patch b/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-001-config.patch new file mode 100644 index 0000000000..f1c30aa1ba --- /dev/null +++ b/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-001-config.patch @@ -0,0 +1,266 @@ +diff -urN u-boot-2008.10-0rig//doc/README.at91 u-boot-2008.10/doc/README.at91 +--- u-boot-2008.10-0rig//doc/README.at91 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-2008.10/doc/README.at91 2008-12-31 12:16:34.000000000 +0100 +@@ -0,0 +1,88 @@ ++Atmel AT91 Evaluation kits ++ ++http://atmel.com/dyn/products/tools.asp?family_id=605#1443 ++ ++------------------------------------------------------------------------------ ++AT91SAM9260EK ++------------------------------------------------------------------------------ ++ ++Memory map ++ 0x20000000 - 23FFFFFF SDRAM (64 MB) ++ 0xC0000000 - Cxxxxxxx Atmel Dataflash card (J13) ++ 0xD0000000 - Dxxxxxxx Soldered Atmel Dataflash ++ ++Environment variables ++ ++ U-Boot environment variables can be stored at different places: ++ - Dataflash on SPI chip select 1 (default) ++ - Dataflash on SPI chip select 0 (dataflash card) ++ - Nand flash. ++ ++ You can choose your storage location at config step (here for at91sam9260ek) : ++ make at91sam9260ek_config - use data flash (spi cs1) (default) ++ make at91sam9260ek_nandflash_config - use nand flash ++ make at91sam9260ek_dataflash_cs0_config - use data flash (spi cs0) ++ make at91sam9260ek_dataflash_cs1_config - use data flash (spi cs1) ++ ++ ++------------------------------------------------------------------------------ ++AT91SAM9261EK ++------------------------------------------------------------------------------ ++ ++Memory map ++ 0x20000000 - 23FFFFFF SDRAM (64 MB) ++ 0xC0000000 - Cxxxxxxx Soldered Atmel Dataflash ++ 0xD0000000 - Dxxxxxxx Atmel Dataflash card (J22) ++ ++Environment variables ++ ++ U-Boot environment variables can be stored at different places: ++ - Dataflash on SPI chip select 0 (default) ++ - Dataflash on SPI chip select 3 (dataflash card) ++ - Nand flash. ++ ++ You can choose your storage location at config step (here for at91sam9260ek) : ++ make at91sam9261ek_config - use data flash (spi cs0) (default) ++ make at91sam9261ek_nandflash_config - use nand flash ++ make at91sam9261ek_dataflash_cs0_config - use data flash (spi cs0) ++ make at91sam9261ek_dataflash_cs3_config - use data flash (spi cs3) ++ ++ ++------------------------------------------------------------------------------ ++AT91SAM9263EK ++------------------------------------------------------------------------------ ++ ++Memory map ++ 0x20000000 - 23FFFFFF SDRAM (64 MB) ++ 0xC0000000 - Cxxxxxxx Atmel Dataflash card (J9) ++ ++Environment variables ++ ++ U-Boot environment variables can be stored at different places: ++ - Dataflash on SPI chip select 0 (dataflash card) ++ - Nand flash. ++ ++ You can choose your storage location at config step (here for at91sam9260ek) : ++ make at91sam9263ek_config - use data flash (spi cs0) (default) ++ make at91sam9263ek_nandflash_config - use nand flash ++ make at91sam9263ek_dataflash_cs0_config - use data flash (spi cs0) ++ ++ ++------------------------------------------------------------------------------ ++AT91SAM9RLEK ++------------------------------------------------------------------------------ ++ ++Memory map ++ 0x20000000 - 23FFFFFF SDRAM (64 MB) ++ 0xC0000000 - Cxxxxxxx Soldered Atmel Dataflash ++ ++Environment variables ++ ++ U-Boot environment variables can be stored at different places: ++ - Dataflash on SPI chip select 0 ++ - Nand flash. ++ ++ You can choose your storage location at config step (here for at91sam9260ek) : ++ make at91sam9263ek_config - use data flash (spi cs0) (default) ++ make at91sam9263ek_nandflash_config - use nand flash ++ make at91sam9263ek_dataflash_cs0_config - use data flash (spi cs0) +diff -urN u-boot-2008.10-0rig//include/configs/at91sam9260ek.h u-boot-2008.10/include/configs/at91sam9260ek.h +--- u-boot-2008.10-0rig//include/configs/at91sam9260ek.h 2008-12-31 12:15:59.000000000 +0100 ++++ u-boot-2008.10/include/configs/at91sam9260ek.h 2008-12-31 12:16:34.000000000 +0100 +@@ -127,10 +127,6 @@ + #define CFG_MEMTEST_START PHYS_SDRAM + #define CFG_MEMTEST_END 0x23e00000 + +-#undef CFG_USE_DATAFLASH_CS0 +-#define CFG_USE_DATAFLASH_CS1 1 +-#undef CFG_USE_NANDFLASH +- + #ifdef CFG_USE_DATAFLASH_CS0 + + /* bootstrap + u-boot + env + linux in dataflash on CS0 */ +diff -urN u-boot-2008.10-0rig//include/configs/at91sam9261ek.h u-boot-2008.10/include/configs/at91sam9261ek.h +--- u-boot-2008.10-0rig//include/configs/at91sam9261ek.h 2008-12-31 12:15:59.000000000 +0100 ++++ u-boot-2008.10/include/configs/at91sam9261ek.h 2008-12-31 12:16:34.000000000 +0100 +@@ -142,9 +142,6 @@ + #define CFG_MEMTEST_START PHYS_SDRAM + #define CFG_MEMTEST_END 0x23e00000 + +-#define CFG_USE_DATAFLASH_CS0 1 +-#undef CFG_USE_NANDFLASH +- + #ifdef CFG_USE_DATAFLASH_CS0 + + /* bootstrap + u-boot + env + linux in dataflash on CS0 */ +@@ -157,6 +154,20 @@ + #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ + "root=/dev/mtdblock0 " \ + "mtdparts=at91_nand:-(root) " \ ++ "rw rootfstype=jffs2" ++ ++#elif CFG_USE_DATAFLASH_CS3 ++ ++/* bootstrap + u-boot + env + linux in dataflash on CS3 */ ++#define CFG_ENV_IS_IN_DATAFLASH 1 ++#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400) ++#define CFG_ENV_OFFSET 0x4200 ++#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS3 + CFG_ENV_OFFSET) ++#define CFG_ENV_SIZE 0x4200 ++#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ ++ "root=/dev/mtdblock0 " \ ++ "mtdparts=at91_nand:-(root) " \ + "rw rootfstype=jffs2" + + #else /* CFG_USE_NANDFLASH */ +diff -urN u-boot-2008.10-0rig//include/configs/at91sam9263ek.h u-boot-2008.10/include/configs/at91sam9263ek.h +--- u-boot-2008.10-0rig//include/configs/at91sam9263ek.h 2008-12-31 12:15:59.000000000 +0100 ++++ u-boot-2008.10/include/configs/at91sam9263ek.h 2008-12-31 12:16:34.000000000 +0100 +@@ -148,9 +148,6 @@ + #define CFG_MEMTEST_START PHYS_SDRAM + #define CFG_MEMTEST_END 0x23e00000 + +-#define CFG_USE_DATAFLASH 1 +-#undef CFG_USE_NANDFLASH +- + #ifdef CFG_USE_DATAFLASH + + /* bootstrap + u-boot + env + linux in dataflash on CS0 */ +diff -urN u-boot-2008.10-0rig//include/configs/at91sam9rlek.h u-boot-2008.10/include/configs/at91sam9rlek.h +--- u-boot-2008.10-0rig//include/configs/at91sam9rlek.h 2008-12-31 12:15:59.000000000 +0100 ++++ u-boot-2008.10/include/configs/at91sam9rlek.h 2008-12-31 12:16:34.000000000 +0100 +@@ -117,9 +117,6 @@ + #define CFG_MEMTEST_START PHYS_SDRAM + #define CFG_MEMTEST_END 0x23e00000 + +-#define CFG_USE_DATAFLASH 1 +-#undef CFG_USE_NANDFLASH +- + #ifdef CFG_USE_DATAFLASH + + /* bootstrap + u-boot + env + linux in dataflash on CS0 */ +diff -urN u-boot-2008.10-0rig//Makefile u-boot-2008.10/Makefile +--- u-boot-2008.10-0rig//Makefile 2008-12-31 12:15:55.000000000 +0100 ++++ u-boot-2008.10/Makefile 2008-12-31 12:18:31.000000000 +0100 +@@ -2487,15 +2487,6 @@ + at91rm9200dk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 + +-at91sam9261ek_config : unconfig +- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91 +- +-at91sam9263ek_config : unconfig +- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91 +- +-at91sam9rlek_config : unconfig +- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91 +- + cmc_pu2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 + +@@ -2518,8 +2509,79 @@ + at91cap9adk_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91 + ++at91sam9260ek_nandflash_config \ ++at91sam9260ek_dataflash_cs0_config \ ++at91sam9260ek_dataflash_cs1_config \ + at91sam9260ek_config : unconfig +- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91 ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ ++ echo "#define CFG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ ++ fi; ++ @$(MKCONFIG) -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 ++ ++at91sam9xeek_nandflash_config \ ++at91sam9xeek_dataflash_cs0_config \ ++at91sam9xeek_dataflash_cs1_config \ ++at91sam9xeek_config : unconfig ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ ++ echo "#define CFG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ ++ fi; ++ @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 ++ ++at91sam9261ek_nandflash_config \ ++at91sam9261ek_dataflash_cs0_config \ ++at91sam9261ek_dataflash_cs3_config \ ++at91sam9261ek_config : unconfig ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ elif [ "$(findstring dataflash_cs3,$@)" ] ; then \ ++ echo "#define CFG_USE_DATAFLASH_CS3 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS3" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ fi; ++ @$(MKCONFIG) -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91 ++ ++at91sam9263ek_nandflash_config \ ++at91sam9263ek_dataflash_config \ ++at91sam9263ek_dataflash_cs0_config \ ++at91sam9263ek_config : unconfig ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ fi; ++ @$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91 ++ ++at91sam9rlek_nandflash_config \ ++at91sam9rlek_dataflash_config \ ++at91sam9rlek_dataflash_cs0_config \ ++at91sam9rlek_config : unconfig ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ fi; ++ @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91 + + ######################################################################## + ## ARM Integrator boards - see doc/README-integrator for more info. diff --git a/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-002-at91sam9g20ek.patch b/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-002-at91sam9g20ek.patch new file mode 100644 index 0000000000..bb7e6b1167 --- /dev/null +++ b/recipes/u-boot/u-boot-2009.01/u-boot-2009.01-exp-002-at91sam9g20ek.patch @@ -0,0 +1,802 @@ +diff -urN u-boot-2008.10-0rig/Makefile u-boot-2008.10/Makefile +--- u-boot-2008.10-0rig/Makefile 2008-12-28 14:07:30.000000000 +0100 ++++ u-boot-2008.10/Makefile 2008-12-28 14:06:28.000000000 +0100 +@@ -2541,6 +2541,22 @@ + fi; + @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 + ++at91sam9g20ek_nandflash_config \ ++at91sam9g20ek_dataflash_cs0_config \ ++at91sam9g20ek_dataflash_cs1_config \ ++at91sam9g20ek_config : unconfig ++ @if [ "$(findstring _nandflash,$@)" ] ; then \ ++ echo "#define CFG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in NAND FLASH" ; \ ++ elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ ++ echo "#define CFG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ ++ else \ ++ echo "#define CFG_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ ++ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ ++ fi; ++ @$(MKCONFIG) -a at91sam9g20ek arm arm926ejs at91sam9g20ek atmel at91 ++ + at91sam9261ek_nandflash_config \ + at91sam9261ek_dataflash_cs0_config \ + at91sam9261ek_dataflash_cs3_config \ +Index: include/configs/at91sam9g20ek.h +=================================================================== +--- a/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4) (revision 0) ++++ b/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4-exp) (revision 8417) +@@ -0,0 +1,198 @@ ++/* ++ * (C) Copyright 2007-2008 ++ * Stelian Pop ++ * Lead Tech Design ++ * ++ * Configuation settings for the AT91SAM9G20EK board. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++/* ARM asynchronous clock */ ++#define AT91_MAIN_CLOCK 396288000 /* from 18.432 MHz crystal */ ++#define AT91_MASTER_CLOCK 132096000 /* peripheral = main / 3 */ ++#define CFG_HZ 1000000 /* 1us resolution */ ++ ++#define AT91_SLOW_CLOCK 32768 /* slow clock */ ++ ++#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ ++#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ ++#define CONFIG_AT91SAM9G20EK 1 /* on an AT91SAM9G20EK Board */ ++#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ ++ ++#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ ++#define CONFIG_SETUP_MEMORY_TAGS 1 ++#define CONFIG_INITRD_TAG 1 ++ ++#define CONFIG_SKIP_LOWLEVEL_INIT ++#define CONFIG_SKIP_RELOCATE_UBOOT ++ ++/* ++ * Hardware drivers ++ */ ++#define CONFIG_ATMEL_USART 1 ++#undef CONFIG_USART0 ++#undef CONFIG_USART1 ++#undef CONFIG_USART2 ++#define CONFIG_USART3 1 /* USART 3 is DBGU */ ++ ++#define CONFIG_BOOTDELAY 3 ++ ++/* ++ * BOOTP options ++ */ ++#define CONFIG_BOOTP_BOOTFILESIZE 1 ++#define CONFIG_BOOTP_BOOTPATH 1 ++#define CONFIG_BOOTP_GATEWAY 1 ++#define CONFIG_BOOTP_HOSTNAME 1 ++ ++/* ++ * Command line configuration. ++ */ ++#include ++#undef CONFIG_CMD_BDI ++#undef CONFIG_CMD_IMI ++#undef CONFIG_CMD_AUTOSCRIPT ++#undef CONFIG_CMD_FPGA ++#undef CONFIG_CMD_LOADS ++#undef CONFIG_CMD_IMLS ++ ++#define CONFIG_CMD_PING 1 ++#define CONFIG_CMD_DHCP 1 ++#define CONFIG_CMD_NAND 1 ++#define CONFIG_CMD_USB 1 ++ ++/* SDRAM */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM 0x20000000 ++#define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ ++ ++/* DataFlash */ ++#define CONFIG_HAS_DATAFLASH 1 ++#define CFG_SPI_WRITE_TOUT (5*CFG_HZ) ++#define CFG_MAX_DATAFLASH_BANKS 2 ++#define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ ++#define CFG_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ ++#define AT91_SPI_CLK 15000000 ++#define DATAFLASH_TCSS (0x22 << 16) ++#define DATAFLASH_TCHS (0x1 << 24) ++ ++/* NAND flash */ ++#define NAND_MAX_CHIPS 1 ++#define CFG_MAX_NAND_DEVICE 1 ++#define CFG_NAND_BASE 0x40000000 ++#define CFG_NAND_DBW_8 1 ++ ++/* NOR flash - no real flash on this board */ ++#define CFG_NO_FLASH 1 ++ ++/* Ethernet */ ++#define CONFIG_MACB 1 ++#define CONFIG_RMII 1 ++#define CONFIG_NET_MULTI 1 ++#define CONFIG_NET_RETRY_COUNT 20 ++#define CONFIG_RESET_PHY_R 1 ++ ++/* USB */ ++#define CONFIG_USB_OHCI_NEW 1 ++#define LITTLEENDIAN 1 ++#define CONFIG_DOS_PARTITION 1 ++#define CFG_USB_OHCI_CPU_INIT 1 ++#define CFG_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9G20_UHP_BASE */ ++#define CFG_USB_OHCI_SLOT_NAME "at91sam9g20" ++#define CFG_USB_OHCI_MAX_ROOT_PORTS 2 ++#define CONFIG_USB_STORAGE 1 ++ ++#define CFG_LOAD_ADDR 0x22000000 /* load address */ ++ ++#define CFG_MEMTEST_START PHYS_SDRAM ++#define CFG_MEMTEST_END 0x23e00000 ++ ++#ifdef CFG_USE_DATAFLASH_CS0 ++ ++/* bootstrap + u-boot + env + linux in dataflash on CS0 */ ++#define CFG_ENV_IS_IN_DATAFLASH 1 ++#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) ++#define CFG_ENV_OFFSET 0x4200 ++#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) ++#define CFG_ENV_SIZE 0x4200 ++#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ ++ "root=/dev/mtdblock0 " \ ++ "mtdparts=at91_nand:-(root) " \ ++ "rw rootfstype=jffs2" ++ ++#elif CFG_USE_DATAFLASH_CS1 ++ ++/* bootstrap + u-boot + env + linux in dataflash on CS1 */ ++#define CFG_ENV_IS_IN_DATAFLASH 1 ++#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) ++#define CFG_ENV_OFFSET 0x4200 ++#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) ++#define CFG_ENV_SIZE 0x4200 ++#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ ++ "root=/dev/mtdblock0 " \ ++ "mtdparts=at91_nand:-(root) " \ ++ "rw rootfstype=jffs2" ++ ++#else /* CFG_USE_NANDFLASH */ ++ ++/* bootstrap + u-boot + env + linux in nandflash */ ++#define CFG_ENV_IS_IN_NAND 1 ++#define CFG_ENV_OFFSET 0x60000 ++#define CFG_ENV_OFFSET_REDUND 0x80000 ++#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ ++#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ ++ "root=/dev/mtdblock5 " \ ++ "mtdparts=at91_nand:128k(bootstrap)ro," \ ++ "256k(uboot)ro,128k(env1)ro," \ ++ "128k(env2)ro,2M(linux),-(root) " \ ++ "rw rootfstype=jffs2" ++ ++#endif ++ ++#define CONFIG_BAUDRATE 115200 ++#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } ++ ++#define CFG_PROMPT "U-Boot> " ++#define CFG_CBSIZE 256 ++#define CFG_MAXARGS 16 ++#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16) ++#define CFG_LONGHELP 1 ++#define CONFIG_CMDLINE_EDITING 1 ++ ++#define ROUND(A, B) (((A) + (B)) & ~((B) - 1)) ++/* ++ * Size of malloc() pool ++ */ ++#define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) ++#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */ ++ ++#define CONFIG_STACKSIZE (32*1024) /* regular stack */ ++ ++#ifdef CONFIG_USE_IRQ ++#error CONFIG_USE_IRQ not supported ++#endif ++ ++#endif +Index: board/atmel/at91sam9g20ek/nand.c +=================================================================== +--- a/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4) (revision 0) ++++ b/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4-exp) (revision 8417) +@@ -0,0 +1,79 @@ ++/* ++ * (C) Copyright 2007-2008 ++ * Stelian Pop ++ * Lead Tech Design ++ * ++ * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++/* ++ * hardware specific access to control-lines ++ */ ++#define MASK_ALE (1 << 21) /* our ALE is AD21 */ ++#define MASK_CLE (1 << 22) /* our CLE is AD22 */ ++ ++static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd, int cmd) ++{ ++ struct nand_chip *this = mtd->priv; ++ ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; ++ ++ IO_ADDR_W &= ~(MASK_ALE|MASK_CLE); ++ switch (cmd) { ++ case NAND_CTL_SETCLE: ++ IO_ADDR_W |= MASK_CLE; ++ break; ++ case NAND_CTL_SETALE: ++ IO_ADDR_W |= MASK_ALE; ++ break; ++ case NAND_CTL_CLRNCE: ++ at91_set_gpio_value(AT91_PIN_PC14, 1); ++ break; ++ case NAND_CTL_SETNCE: ++ at91_set_gpio_value(AT91_PIN_PC14, 0); ++ break; ++ } ++ this->IO_ADDR_W = (void *) IO_ADDR_W; ++} ++ ++static int at91sam9g20ek_nand_ready(struct mtd_info *mtd) ++{ ++ return at91_get_gpio_value(AT91_PIN_PC13); ++} ++ ++int board_nand_init(struct nand_chip *nand) ++{ ++ nand->eccmode = NAND_ECC_SOFT; ++#ifdef CFG_NAND_DBW_16 ++ nand->options = NAND_BUSWIDTH_16; ++#endif ++ nand->hwcontrol = at91sam9g20ek_nand_hwcontrol; ++ nand->dev_ready = at91sam9g20ek_nand_ready; ++ nand->chip_delay = 20; ++ ++ return 0; ++} +Index: board/atmel/at91sam9g20ek/at91sam9g20ek.c +=================================================================== +--- a/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4) (revision 0) ++++ b/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4-exp) (revision 8417) +@@ -0,0 +1,250 @@ ++/* ++ * (C) Copyright 2007-2008 ++ * Stelian Pop ++ * Lead Tech Design ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) ++#include ++#endif ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++/* ------------------------------------------------------------------------- */ ++/* ++ * Miscelaneous platform dependent initialisations ++ */ ++ ++static void at91sam9g20ek_serial_hw_init(void) ++{ ++#ifdef CONFIG_USART0 ++ at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ ++ at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0); ++#endif ++ ++#ifdef CONFIG_USART1 ++ at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ ++ at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1); ++#endif ++ ++#ifdef CONFIG_USART2 ++ at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ ++ at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2); ++#endif ++ ++#ifdef CONFIG_USART3 /* DBGU */ ++ at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ ++ at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); ++#endif ++} ++ ++#ifdef CONFIG_CMD_NAND ++static void at91sam9g20ek_nand_hw_init(void) ++{ ++ unsigned long csa; ++ ++ /* Enable CS3 */ ++ csa = at91_sys_read(AT91_MATRIX_EBICSA); ++ at91_sys_write(AT91_MATRIX_EBICSA, ++ csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); ++ ++ /* Configure SMC CS3 for NAND/SmartMedia */ ++ at91_sys_write(AT91_SMC_SETUP(3), ++ AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | ++ AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); ++ at91_sys_write(AT91_SMC_PULSE(3), ++ AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(3) | ++ AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(3)); ++ at91_sys_write(AT91_SMC_CYCLE(3), ++ AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7)); ++ at91_sys_write(AT91_SMC_MODE(3), ++ AT91_SMC_READMODE | AT91_SMC_WRITEMODE | ++ AT91_SMC_EXNWMODE_DISABLE | ++#ifdef CFG_NAND_DBW_16 ++ AT91_SMC_DBW_16 | ++#else /* CFG_NAND_DBW_8 */ ++ AT91_SMC_DBW_8 | ++#endif ++ AT91_SMC_TDF_(3)); ++ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); ++ ++ /* Configure RDY/BSY */ ++ at91_set_gpio_input(AT91_PIN_PC13, 1); ++ ++ /* Enable NandFlash */ ++ at91_set_gpio_output(AT91_PIN_PC14, 1); ++} ++#endif ++ ++#ifdef CONFIG_HAS_DATAFLASH ++static void at91sam9g20ek_spi_hw_init(void) ++{ ++ at91_set_A_periph(AT91_PIN_PA3, 0); /* SPI0_NPCS0 */ ++ at91_set_B_periph(AT91_PIN_PC11, 0); /* SPI0_NPCS1 */ ++ ++ at91_set_A_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ ++ at91_set_A_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ ++ at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ ++ ++ /* Enable clock */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0); ++} ++#endif ++ ++#ifdef CONFIG_MACB ++static void at91sam9g20ek_macb_hw_init(void) ++{ ++ /* Enable clock */ ++ at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC); ++ ++ /* ++ * Disable pull-up on: ++ * RXDV (PA17) => PHY normal mode (not Test mode) ++ * ERX0 (PA14) => PHY ADDR0 ++ * ERX1 (PA15) => PHY ADDR1 ++ * ERX2 (PA25) => PHY ADDR2 ++ * ERX3 (PA26) => PHY ADDR3 ++ * ECRS (PA28) => PHY ADDR4 => PHYADDR = 0x0 ++ * ++ * PHY has internal pull-down ++ */ ++ writel(pin_to_mask(AT91_PIN_PA14) | ++ pin_to_mask(AT91_PIN_PA15) | ++ pin_to_mask(AT91_PIN_PA17) | ++ pin_to_mask(AT91_PIN_PA25) | ++ pin_to_mask(AT91_PIN_PA26) | ++ pin_to_mask(AT91_PIN_PA28), ++ pin_to_controller(AT91_PIN_PA0) + PIO_PUDR); ++ ++ /* Need to reset PHY -> 500ms reset */ ++ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | ++ (AT91_RSTC_ERSTL & (0x0D << 8)) | ++ AT91_RSTC_URSTEN); ++ ++ at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); ++ ++ /* Wait for end hardware reset */ ++ while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL)); ++ ++ /* Restore NRST value */ ++ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | ++ (AT91_RSTC_ERSTL & (0x0 << 8)) | ++ AT91_RSTC_URSTEN); ++ ++ /* Re-enable pull-up */ ++ writel(pin_to_mask(AT91_PIN_PA14) | ++ pin_to_mask(AT91_PIN_PA15) | ++ pin_to_mask(AT91_PIN_PA17) | ++ pin_to_mask(AT91_PIN_PA25) | ++ pin_to_mask(AT91_PIN_PA26) | ++ pin_to_mask(AT91_PIN_PA28), ++ pin_to_controller(AT91_PIN_PA0) + PIO_PUER); ++ ++ at91_set_A_periph(AT91_PIN_PA19, 0); /* ETXCK_EREFCK */ ++ at91_set_A_periph(AT91_PIN_PA17, 0); /* ERXDV */ ++ at91_set_A_periph(AT91_PIN_PA14, 0); /* ERX0 */ ++ at91_set_A_periph(AT91_PIN_PA15, 0); /* ERX1 */ ++ at91_set_A_periph(AT91_PIN_PA18, 0); /* ERXER */ ++ at91_set_A_periph(AT91_PIN_PA16, 0); /* ETXEN */ ++ at91_se