armadeus-commitlog Mailing List for armadeus (Page 82)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-21 16:17:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fd2bd23bf85d68b76d8f87c812da0c3e125d958c (commit)
via f4bbd0b2926a1c0e36d3b0ae7580a13b16900470 (commit)
from aff8b8579037b8492962d09223bbed027a168b0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fd2bd23bf85d68b76d8f87c812da0c3e125d958c
Merge: f4bbd0b aff8b85
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 21 17:14:29 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit f4bbd0b2926a1c0e36d3b0ae7580a13b16900470
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 21 17:13:57 2012 +0100
[BUILDROOT] Add (preliminary) support for BR2012.02. Only for APF28 yet.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 +-
buildroot/configs/apf28_defconfig | 11 +-
buildroot/target/device/armadeus/Makefile.in | 6 +
.../target/device/armadeus/busybox-1.19.3.config | 1 +
.../target/device/armadeus/busybox-1.19.config | 1013 ++++++++++++++++++++
.../target/device/armadeus/uClibc-0.9.33.config | 257 +++++
patches/buildroot/2012.02-rc1 | 1 +
.../2012.02/001-add_armadeus_device.patch | 21 +
.../002-add_armadeus_specific_packages.patch | 16 +
patches/buildroot/2012.02/006-lcd4linux.patch | 753 +++++++++++++++
patches/buildroot/2012.02/018-allegro.patch | 114 +++
.../buildroot/2012.02/021-sdl-water-config.patch | 99 ++
patches/buildroot/2012.02/034-slideshow.patch | 224 +++++
.../2012.02/038-fakeroot-bump_version.patch | 16 +
patches/buildroot/2012.02/040-linux-makefile.patch | 42 +
.../buildroot/2012.02/043-mesa-add_packages.patch | 287 ++++++
.../2012.02/045-openssh-add_passwd_expire.patch | 18 +
patches/buildroot/2012.02/047-uclibc-config.patch | 28 +
...1b-u-boot-change_board_name_default_value.patch | 14 +
...d_possibility_to_choose_board_header_file.patch | 51 +
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 +
...ot-makes_binary_targets_name_overloadable.patch | 21 +
...x-adds_linux26-patched_target_to_Makefile.patch | 15 +
.../2012.02/057-pymysql-add_package.patch | 144 +++
...x_in_a_standalone_way_after_configuration.patch | 13 +
...-linux-change_board_specific_patches_name.patch | 13 +
.../buildroot/2012.02/081-adds_quake_package.patch | 177 ++++
.../buildroot/2012.02/085-adds_gpm_package.patch | 168 ++++
.../buildroot/2012.02/095-uucp-add_packages.patch | 63 ++
.../buildroot/2012.02/097-adds_flite_package.patch | 81 ++
...for_pld_asm_instruction_on_non_armv5_arch.patch | 22 +
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++
...e-add_infrastructure_to_install_firmwares.patch | 149 +++
.../buildroot/2012.02/107-games-add_wolf4sdl.patch | 92 ++
.../buildroot/2012.02/110-bluez3-add_package.patch | 118 +++
patches/buildroot/2012.02/111-bluez3-hacks.patch | 198 ++++
...-linux_eabi_config_option_support_for_arm.patch | 51 +
.../2012.02/116-openobex-add_package.patch | 146 +++
.../2012.02/117-ussp-push-add_package.patch | 48 +
.../buildroot/2012.02/118-snes9x-add_package.patch | 417 ++++++++
.../buildroot/2012.02/119-fbtest-add_package.patch | 174 ++++
.../buildroot/2012.02/120-cwiid-add_package.patch | 106 ++
.../2012.02/121-target-arm926t_is_arm926ej-s.patch | 18 +
.../buildroot/2012.02/122-urg-add_package.patch | 56 ++
.../2012.02/123-pywebradio-add_package.patch | 56 ++
.../buildroot/2012.02/124-e-uae-add_package.patch | 54 +
.../2012.02/125-opentyrian-add_package.patch | 83 ++
.../2012.02/130-lbreakout-add_package.patch | 82 ++
.../2012.02/131-ltetris-add_package.patch | 84 ++
...-qt-full_integration_with_cross_compiling.patch | 57 ++
.../buildroot/2012.02/133-qwt-add_package.patch | 163 ++++
...ffs2-add_board_name_to_binary_rootfs_name.patch | 30 +
.../135-linux-add_linux26-clean_target.patch | 11 +
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 +
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 +
...fix_installation_bug_on_some_host_systems.patch | 19 +
.../152-uclibc-add_times_syscall_patches.patch | 120 +++
...153-busybox-fix_1.16_build_with_make_3.82.patch | 42 +
.../2012.02/155-alsa-force_1_0_23_version.patch | 75 ++
.../156-u.boot-remove-u-boot-patch-prefix.patch | 22 +
...lection_even_when_custom_rootfs_is_chosen.patch | 46 +
.../2012.02/158-setserial-bump_version.patch | 17 +
.../2012.02/164-nanocom-add_package.patch | 57 ++
.../2012.02/165-elftosb-add_host_tools.patch | 74 ++
.../2012.02/168-libcanfestival-add_package.patch | 149 +++
.../170-mplayer-make_it_compile_on_apf51.patch | 17 +
.../buildroot/2012.02/172-gsmmux-add_package.patch | 88 ++
patches/buildroot/2012.02/cleanup_buildroot.sh | 64 ++
68 files changed, 6936 insertions(+), 10 deletions(-)
create mode 120000 buildroot/target/device/armadeus/busybox-1.19.3.config
create mode 100644 buildroot/target/device/armadeus/busybox-1.19.config
create mode 100644 buildroot/target/device/armadeus/uClibc-0.9.33.config
create mode 120000 patches/buildroot/2012.02-rc1
create mode 100644 patches/buildroot/2012.02/001-add_armadeus_device.patch
create mode 100644 patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch
create mode 100644 patches/buildroot/2012.02/006-lcd4linux.patch
create mode 100644 patches/buildroot/2012.02/018-allegro.patch
create mode 100644 patches/buildroot/2012.02/021-sdl-water-config.patch
create mode 100644 patches/buildroot/2012.02/034-slideshow.patch
create mode 100644 patches/buildroot/2012.02/038-fakeroot-bump_version.patch
create mode 100644 patches/buildroot/2012.02/040-linux-makefile.patch
create mode 100644 patches/buildroot/2012.02/043-mesa-add_packages.patch
create mode 100644 patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch
create mode 100644 patches/buildroot/2012.02/047-uclibc-config.patch
create mode 100644 patches/buildroot/2012.02/051b-u-boot-change_board_name_default_value.patch
create mode 100644 patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2012.02/051g-u-boot-add_u-boot-unpacked_target.patch
create mode 100644 patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
create mode 100644 patches/buildroot/2012.02/052-linux-adds_linux26-patched_target_to_Makefile.patch
create mode 100644 patches/buildroot/2012.02/057-pymysql-add_package.patch
create mode 100644 patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
create mode 100644 patches/buildroot/2012.02/071-linux-change_board_specific_patches_name.patch
create mode 100644 patches/buildroot/2012.02/081-adds_quake_package.patch
create mode 100644 patches/buildroot/2012.02/085-adds_gpm_package.patch
create mode 100644 patches/buildroot/2012.02/095-uucp-add_packages.patch
create mode 100644 patches/buildroot/2012.02/097-adds_flite_package.patch
create mode 100644 patches/buildroot/2012.02/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
create mode 100644 patches/buildroot/2012.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2012.02/106-firmware-add_infrastructure_to_install_firmwares.patch
create mode 100644 patches/buildroot/2012.02/107-games-add_wolf4sdl.patch
create mode 100644 patches/buildroot/2012.02/110-bluez3-add_package.patch
create mode 100644 patches/buildroot/2012.02/111-bluez3-hacks.patch
create mode 100644 patches/buildroot/2012.02/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
create mode 100644 patches/buildroot/2012.02/116-openobex-add_package.patch
create mode 100644 patches/buildroot/2012.02/117-ussp-push-add_package.patch
create mode 100644 patches/buildroot/2012.02/118-snes9x-add_package.patch
create mode 100644 patches/buildroot/2012.02/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2012.02/120-cwiid-add_package.patch
create mode 100644 patches/buildroot/2012.02/121-target-arm926t_is_arm926ej-s.patch
create mode 100644 patches/buildroot/2012.02/122-urg-add_package.patch
create mode 100644 patches/buildroot/2012.02/123-pywebradio-add_package.patch
create mode 100644 patches/buildroot/2012.02/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2012.02/125-opentyrian-add_package.patch
create mode 100644 patches/buildroot/2012.02/130-lbreakout-add_package.patch
create mode 100644 patches/buildroot/2012.02/131-ltetris-add_package.patch
create mode 100644 patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2012.02/133-qwt-add_package.patch
create mode 100644 patches/buildroot/2012.02/134-jffs2-add_board_name_to_binary_rootfs_name.patch
create mode 100644 patches/buildroot/2012.02/135-linux-add_linux26-clean_target.patch
create mode 100644 patches/buildroot/2012.02/142-ncurses-fix_compilation_with_old_hosts.patch
create mode 100644 patches/buildroot/2012.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
create mode 100644 patches/buildroot/2012.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
create mode 100644 patches/buildroot/2012.02/152-uclibc-add_times_syscall_patches.patch
create mode 100644 patches/buildroot/2012.02/153-busybox-fix_1.16_build_with_make_3.82.patch
create mode 100644 patches/buildroot/2012.02/155-alsa-force_1_0_23_version.patch
create mode 100644 patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch
create mode 100644 patches/buildroot/2012.02/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
create mode 100644 patches/buildroot/2012.02/158-setserial-bump_version.patch
create mode 100644 patches/buildroot/2012.02/164-nanocom-add_package.patch
create mode 100644 patches/buildroot/2012.02/165-elftosb-add_host_tools.patch
create mode 100644 patches/buildroot/2012.02/168-libcanfestival-add_package.patch
create mode 100644 patches/buildroot/2012.02/170-mplayer-make_it_compile_on_apf51.patch
create mode 100644 patches/buildroot/2012.02/172-gsmmux-add_package.patch
create mode 100755 patches/buildroot/2012.02/cleanup_buildroot.sh
diff --git a/Makefile b/Makefile
index fdb3385..456b59c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Makefile for Armadeus
#
-# Copyright (C) 2005-2011 by the Armadeus Team
+# Copyright (C) 2005-2012 by the Armadeus Team
#
# 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
@@ -38,7 +38,11 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
-
+ifeq ($(BUILDROOT_VERSION),2012.02-rc1)
+BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
+else
+BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/toolchain/patch-kernel.sh
+endif
ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
@@ -79,6 +83,7 @@ help:
@echo ' linux-menuconfig - configure Linux parameters'
@echo ' uclibc-menuconfig - configure uClibc library parameters'
@echo ' busybox-menuconfig - configure Busybox shell parameters'
+ @echo ' ctng-menuconfig - configure CrosstoolNG parameters'
@echo
@echo 'Miscellaneous:'
@echo ' source - download all sources needed for offline-build'
@@ -108,7 +113,7 @@ $(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDRO
buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
$(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
- $(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
+ $(BUILDROOT_PATCH_SCRIPT) $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
touch $@
buildroot-patched: $(BUILDROOT_DIR)/.patched
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index bad767e..02bfb06 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -9,13 +9,11 @@ BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
-BR2_UCLIBC_VERSION_0_9_30=y
+BR2_UCLIBC_VERSION_0_9_33=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
-BR2_GCC_VERSION_4_4_X=y
+BR2_BINUTILS_VERSION_2_22=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-BR2_GDB_VERSION_6_7_1=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
@@ -23,7 +21,6 @@ BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
@@ -61,11 +58,11 @@ BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
-BR2_TARGET_UBOOT_TOOL_ENV=y
+BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 318ab86..ac92305 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -4,15 +4,21 @@ ARMADEUS_PATH:=target/device/armadeus
BOARD_NAME:=$(call qstrip,$(BR2_BOARD_NAME))
BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
+ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
+# for old BR:
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# U-Boot variables overloading:
+# old BR (U_BOOT_BIN):
U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
+# new BR:
+ARMADEUS_UBOOT_IMAGE_NAME = $(BOARD_NAME)-u-boot.bin
ifeq ($(BOARD_NAME),apf9328)
U_BOOT_BIN=u-boot.bin
else ifeq ($(BOARD_NAME),apf28)
U_BOOT_BIN=u-boot.sb
U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
+ARMADEUS_UBOOT_IMAGE_NAME = $(BOARD_NAME)-u-boot.sb
TARGETS+=host-elftosb host-imx28-usb-downloader
else
U_BOOT_BIN=u-boot-nand.bin
diff --git a/buildroot/target/device/armadeus/busybox-1.19.3.config b/buildroot/target/device/armadeus/busybox-1.19.3.config
new file mode 120000
index 0000000..9969908
--- /dev/null
+++ b/buildroot/target/device/armadeus/busybox-1.19.3.config
@@ -0,0 +1 @@
+busybox-1.19.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/busybox-1.19.config b/buildroot/target/device/armadeus/busybox-1.19.config
new file mode 100644
index 0000000..f999a87
--- /dev/null
+++ b/buildroot/target/device/armadeus/busybox-1.19.config
@@ -0,0 +1,1013 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.19.3
+# Mon Feb 20 16:26:36 2012
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+CONFIG_FEATURE_CLEAN_UP=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+# CONFIG_FEATURE_SYSTEMD is not set
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=1
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+# CONFIG_FEATURE_SEAMLESS_Z is not set
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_UNLZMA=y
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+# CONFIG_BASE64 is not set
+CONFIG_WHO=y
+# CONFIG_USERS is not set
+# CONFIG_CAL is not set
+CONFIG_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_FGCONSOLE=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_BOOTCHARTD=y
+CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
+CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_MODINFO=y
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+CONFIG_BLOCKDEV=y
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+CONFIG_LSUSB=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+CONFIG_SETARCH=y
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+CONFIG_ADJTIMEX=y
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
+CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+CONFIG_MOUNTPOINT=y
+CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_SETSID=y
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+CONFIG_FEATURE_INETD_RPC=y
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+CONFIG_IOSTAT=y
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+CONFIG_SMEMCAP=y
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+CONFIG_FEATURE_TOPMEM=y
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_CMDCMD=y
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
diff --git a/buildroot/target/device/armadeus/uClibc-0.9.33.config b/buildroot/target/device/armadeus/uClibc-0.9.33.config
new file mode 100644
index 0000000..d592c51
--- /dev/null
+++ b/buildroot/target/device/armadeus/uClibc-0.9.33.config
@@ -0,0 +1,257 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.33
+# Mon Feb 20 21:41:13 2012
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+# TARGET_c6x is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_EABI=y
+# COMPILE_IN_THUMB_MODE is not set
+USE_BX=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus-git-formation-51/buildroot/output/toolchain/linux/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+DOPIC=y
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+LDSO_PRELOAD_ENV_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+# LDSO_RUNPATH is not set
+LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
+# LDSO_NO_CLEANUP is not set
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+# LINUXTHREADS_OLD is not set
+# LINUXTHREADS_NEW is not set
+UCLIBC_HAS_THREADS_NATIVE=y
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_TLS=y
+PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_26=y
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=y
+# UCLIBC_SUPPORT_AI_ADDRCONFIG is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+UCLIBC_HAS_LOCALE=y
+# UCLIBC_BUILD_ALL_LOCALE is not set
+UCLIBC_BUILD_MINIMAL_LOCALE=y
+# UCLIBC_PREGENERATED_LOCALE_DATA is not set
+UCLIBC_BUILD_MINIMAL_LOCALES="en_US"
+UCLIBC_HAS_XLOCALE=y
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_STDIO_FUTEXES=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+# UCLIBC_HAS_WORDEXP is not set
+# UCLIBC_HAS_NFTW is not set
+UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+# UCLIBC_HAS_UTMPX is not set
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# Development/debugging options
+#
+CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus-git-formation-51/buildroot/output/host/usr/bin/arm-unknown-linux-uclibcgnueabi-"
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/patches/buildroot/2012.02-rc1 b/patches/buildroot/2012.02-rc1
new file mode 120000
index 0000000..ef847b1
--- /dev/null
+++ b/patches/buildroot/2012.02-rc1
@@ -0,0 +1 @@
+2012.02
\ No newline at end of file
diff --git a/patches/buildroot/2012.02/001-add_armadeus_device.patch b/patches/buildroot/2012.02/001-add_armadeus_device.patch
new file mode 100644
index 0000000..b952e5f
--- /dev/null
+++ b/patches/buildroot/2012.02/001-add_armadeus_device.patch
@@ -0,0 +1,21 @@
+Add armadeus target specific menu to BR.
+
+Index: buildroot/target/generic/Config.in
+===================================================================
+--- buildroot.orig/target/generic/Config.in 2012-02-21 16:43:29.000000000 +0100
++++ buildroot/target/generic/Config.in 2012-02-21 16:43:48.000000000 +0100
+@@ -149,4 +149,5 @@
+ only argument. Make sure the exit code of that script is 0,
+ otherwise make will stop after calling it.
+
++source "target/device/armadeus/Config.in"
+ endmenu
+Index: buildroot/target/Makefile.in
+===================================================================
+--- buildroot.orig/target/Makefile.in 2012-02-21 16:43:29.000000000 +0100
++++ buildroot/target/Makefile.in 2012-02-21 16:43:48.000000000 +0100
+@@ -1,3 +1,4 @@
+ # make sure to put everything that is board-specific before the tarroot targets
+ include target/generic/Makefile.in
+
++include target/device/armadeus/Makefile.in
diff --git a/patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch
new file mode 100644
index 0000000..bd5703d
--- /dev/null
+++ b/patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch
@@ -0,0 +1,16 @@
+Add armadeus specific packages menu to BR.
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-02-21 16:43:29.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 16:43:56.000000000 +0100
+@@ -3,6 +3,9 @@
+ source "package/busybox/Config.in"
+ source "package/customize/Config.in"
+
++# Armadeus specific
++source "package/armadeus/Config.in"
++
+ # Audio and video applications
+ source "package/multimedia/Config.in"
+
diff --git a/patches/buildroot/2012.02/006-lcd4linux.patch b/patches/buildroot/2012.02/006-lcd4linux.patch
new file mode 100644
index 0000000..4fb09d7
--- /dev/null
+++ b/patches/buildroot/2012.02/006-lcd4linux.patch
@@ -0,0 +1,753 @@
+Add lcd4linux package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-02-21 16:43:56.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 16:43:57.000000000 +0100
+@@ -194,6 +194,7 @@
+ source "package/irda-utils/Config.in"
+ source "package/kbd/Config.in"
+ source "package/linux-firmware/Config.in"
++source "package/lcd4linux/Config.in"
+ source "package/lm-sensors/Config.in"
+ source "package/lsuio/Config.in"
+ source "package/lvm2/Config.in"
+Index: buildroot/package/lcd4linux/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/Config.in 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_LCD4LINUX
++ bool "LCD4Linux daemon"
++ select BR2_PACKAGE_NCURSES
++ help
++ LCD4Linux allows you to show some system parameters on a textual LCD
++ connected to your Armadeus board.
++
+Index: buildroot/package/lcd4linux/lcd4linux.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux.mk 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,66 @@
++#############################################################
++#
++# LCD4Linux daemon
++#
++#############################################################
++
++LCD4LINUX_VER:=0.10.1-RC2
++LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
++LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
++LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
++LCD4LINUX_CAT:=zcat
++LCD4LINUX_BINARY:=lcd4linux
++LCD4LINUX_TARGET_BINARY:=usr/bin/lcd4linux
++LCD4LINUX_PATCH:=lcd4linux_armadeus.patch
++LCD4LINUX_CONF:=lcd4linux_armadeus.conf
++LCD4LINUX_TARGET_CONF:=etc/lcd4linux.conf
++
++
++$(DL_DIR)/$(LCD4LINUX_SOURCE):
++ $(call DOWNLOAD,$(LCD4LINUX_SITE),$(LCD4LINUX_SOURCE))
++
++lcd4linux-source: $(DL_DIR)/$(LCD4LINUX_SOURCE)
++
++$(LCD4LINUX_DIR)/.unpacked: $(DL_DIR)/$(LCD4LINUX_SOURCE)
++ $(LCD4LINUX_CAT) $(DL_DIR)/$(LCD4LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(LCD4LINUX_DIR)/.patched: $(LCD4LINUX_DIR)/.unpacked
++ toolchain/patch-kernel.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
++ (if [ -d $(BUILD_DIR)/linux-2.6.12/include/asm-generic ]; then ln -sf $(BUILD_DIR)/linux-2.6.12/include/asm-generic/ $(BUILD_DIR)/staging_dir/arm-linux-uclibc/sys-include/asm-generic; fi)
++ touch $@
++
++$(LCD4LINUX_DIR)/.configured: $(LCD4LINUX_DIR)/.patched
++ (cd $(LCD4LINUX_DIR); rm -rf config.cache; \
++ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ./configure \
++ --host=$(GNU_TARGET_NAME) \
++ );
++ touch $@
++
++$(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY): $(LCD4LINUX_DIR)/.configured
++ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR)
++
++$(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY): $(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY)
++ install -D $< $@
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++ cp package/lcd4linux/$(LCD4LINUX_CONF) $(TARGET_DIR)/$(LCD4LINUX_TARGET_CONF)
++
++lcd4linux: uclibc ncurses $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
++
++lcd4linux-clean:
++ rm -f $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
++ -$(MAKE) -C $(LCD4LINUX_DIR) clean
++
++lcd4linux-dirclean:
++ rm -rf $(LCD4LINUX_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_LCD4LINUX)),y)
++TARGETS+=lcd4linux
++endif
+Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,13 @@
++This plugin doesn't compile yet (/anymore?)
++
++--- lcd4linux-0.10.0/configure.org 2007-11-21 22:31:40.000000000 +0100
+++++ lcd4linux-0.10.0/configure 2007-11-21 22:32:04.000000000 +0100
++@@ -6366,7 +6366,7 @@
++ PLUGIN_STATFS="yes"
++ PLUGIN_UNAME="yes"
++ PLUGIN_UPTIME="yes"
++- PLUGIN_WIRELESS="yes"
+++ PLUGIN_WIRELESS="no"
++ PLUGIN_XMMS="yes"
++ ;;
++ apm)
+Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2012-02-21 16:43:57.000000000 +0100
+@@ -0,0 +1,181 @@
++diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
++--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
+++++ lcd4linux-0.10.0.armadeus/configure 2005-09-11 20:39:47.000000000 +0200
++@@ -7242,7 +7242,7 @@ for driver in $drivers; do
++ picoLCD="yes"
++ PNG="yes"
++ PPM="yes"
++- ROUTERBOARD="yes"
+++ ROUTERBOARD="no"
++ SAMPLE="yes"
++ SERDISPLIB="yes"
++ SIMPLELCD="yes"
++diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
++--- lcd4linux-0.10.0/drv_generic_parport.c 2005-05-08 06:32:44.000000000 +0200
+++++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c 2005-09-11 20:46:27.000000000 +0200
++@@ -215,9 +215,8 @@ int drv_generic_parport_open(const char
++ return -1;
++ }
++ } else
++-#endif
++-
++ {
+++#else
++ error("using raw port 0x%x (deprecated!)", Port);
++ error("You *really* should change your setup and use ppdev!");
++ if ((Port + 3) <= 0x3ff) {
++@@ -231,6 +230,7 @@ int drv_generic_parport_open(const char
++ return -1;
++ }
++ }
+++#endif // WITH_PPDEV
++ }
++ return 0;
++ }
++@@ -250,9 +250,9 @@ int drv_generic_parport_close(void)
++ }
++ free(PPdev);
++ } else
++-#endif
++ {
++ debug("closing raw port 0x%x", Port);
+++#else
++ if ((Port + 3) <= 0x3ff) {
++ if (ioperm(Port, 3, 0) != 0) {
++ error("%s: ioperm(0x%x) failed: %s", Driver, Port, strerror(errno));
++@@ -264,6 +264,7 @@ int drv_generic_parport_close(void)
++ return -1;
++ }
++ }
+++#endif // WITH_PPDEV
++ }
++
++ return 0;
++@@ -426,11 +427,12 @@ void drv_generic_parport_direction(const
++ if (PPdev) {
++ ioctl(PPfd, PPDATADIR, &direction);
++ } else
++-#endif
++ {
+++#else
++ /* code stolen from linux/parport_pc.h */
++ ctr = (ctr & ~0x20) ^ (direction ? 0x20 : 0x00);
++ outb(ctr, Port + 2);
+++#endif
++ }
++ }
++
++@@ -445,9 +447,10 @@ unsigned char drv_generic_parport_status
++ if (PPdev) {
++ ioctl(PPfd, PPRSTATUS, &data);
++ } else
++-#endif
++ {
+++#else
++ data = inb(Port + 1);
+++#endif
++ }
++
++ /* clear unused bits */
++@@ -476,11 +479,12 @@ void drv_generic_parport_control(const u
++ frob.val = val;
++ ioctl(PPfd, PPFCONTROL, &frob);
++ } else
++-#endif
++ {
+++#else
++ /* code stolen from linux/parport_pc.h */
++ ctr = (ctr & ~mask) ^ val;
++ outb(ctr, Port + 2);
+++#endif
++ }
++ }
++
++@@ ...
[truncated message content] |
|
From: Nicolas <th...@us...> - 2012-02-21 07:35:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via aff8b8579037b8492962d09223bbed027a168b0d (commit)
from 75ee35dec2f10b85e786c0062251df515f24d91d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aff8b8579037b8492962d09223bbed027a168b0d
Author: nicolas <nicolas@nicolas-Studio-1558.(none)>
Date: Tue Feb 21 08:35:31 2012 +0100
[TOOLS] change apf51 uboot recover file skipping firmware autoload
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf51-u-boot.bin | Bin 256956 -> 255824 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/software/uboot_recover/apf51-u-boot.bin b/software/uboot_recover/apf51-u-boot.bin
index 6b4982a..ef3777b 100644
Binary files a/software/uboot_recover/apf51-u-boot.bin and b/software/uboot_recover/apf51-u-boot.bin differ
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-20 23:59:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 75ee35dec2f10b85e786c0062251df515f24d91d (commit)
via f294bdc5ec46d4afd9d130f8ba98a4e24b511257 (commit)
via 2194eaa6f9f0b60d5d7d9f0f58d36020ec2f4fbd (commit)
from 9deef899fd3d76d87802e264989f1709cacf1308 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 75ee35dec2f10b85e786c0062251df515f24d91d
Merge: f294bdc 9deef89
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 21 00:58:38 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit f294bdc5ec46d4afd9d130f8ba98a4e24b511257
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 21 00:58:17 2012 +0100
[UBOOT] apf51: add config option for uboot 2011.12 to force number of RAM on rev 0 boards - rev 1 support auto detection of number of RAM and UBoot autorelocation at the end of RAM
commit 2194eaa6f9f0b60d5d7d9f0f58d36020ec2f4fbd
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 21 00:16:40 2012 +0100
[UBOOT] apf51: support UBoot 2011.12 relocation to the end of the 2nd flash
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2011.12.h | 886 ++++++++++++++++++++
...ariable-to-check-number-of-ram-at-runtime.patch | 23 +
patches/u-boot/2011.12/401-apf51.patch | 53 +-
patches/u-boot/2011.12/409-apf51-nand-spl.patch | 4 +-
4 files changed, 947 insertions(+), 19 deletions(-)
create mode 100644 buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
create mode 100644 patches/buildroot/2011.05/173-u-boot-add-variable-to-check-number-of-ram-at-runtime.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
new file mode 100644
index 0000000..1f64949
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
@@ -0,0 +1,886 @@
+/*
+ *
+ * Configuration settings for the Armadeus Project apf51 board.
+ *
+ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus 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
+ *
+ * 2010/03/31 Initial version based on apf27 configuration file
+ * 2011/05/02 patch V0.5 updates NAND OOB to be mx51 linux kernel compliant
+ * (at least for the first 11 spare bytes..)
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_VERSION_VARIABLE
+#define CONFIG_ENV_VERSION "0.6"
+#define CONFIG_IDENT_STRING " apf51 patch 0.8"
+
+/*
+ * High Level Configuration Options
+ * (easy to change)
+ */
+
+#define CONFIG_ARMV7 /* This is armv7 Cortex-A8 CPU */
+#define CONFIG_MX51 /* in a Freescale i.MX51 Chip */
+#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
+#define CONFIG_MACH_TYPE 2795 /* APF51 */
+
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_SHOW_BOOT_PROGRESS
+
+#define CONFIG_SYS_TEXT_BASE 0x97000000
+
+/*
+ * Select serial console configuration
+ */
+#define CONFIG_MXC_UART
+#define CONFIG_MXC_UART_BASE UART3_BASE
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+#define CONFIG_BAUDRATE 115200
+
+/*
+ * Boot options. Setting delay to -1 stops autostart count down.
+ */
+#define CONFIG_BOOTDELAY 5
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+
+#define CONFIG_BOOTARGS \
+ CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
+
+#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_MTDMAP "mxc_nand"
+#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":1M(U-boot)ro," \
+ "1M(U-boot_env),1M(firmware)," \
+ "8M(kernel)," \
+ "-(rootfs)"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "env_version=" CONFIG_ENV_VERSION "\0" \
+ "fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
+ "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "console=" CONFIG_CONSOLE "\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "partition=nand0,4\0" \
+ "uboot_offset=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "env_offset=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
+ "env_len=" MK_STR(CONFIG_ENV_RANGE) "\0" \
+ "firmware_offset=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
+ "firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
+ "kernel_offset=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
+ "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
+ "rootfs_offset=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
+ "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
+ "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
+ "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
+ "ntpserverip=217.147.208.1\0" \
+ "mmcroot=/dev/mmcblk0p1\0" \
+ "mmcrootfstype=ext2\0" \
+ "quiet=1\0" \
+ "addnfsargs=setenv bootargs ${bootargs} " \
+ "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
+ "addjffsargs=setenv bootargs ${bootargs} " \
+ "root=/dev/mtdblock4 rootfstype=jffs2\0" \
+ "addubifsargs=setenv bootargs ${bootargs} " \
+ "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
+ "addmmcargs=setenv bootargs ${bootargs} " \
+ "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
+ "addipargs=setenv bootargs ${bootargs} " \
+ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
+ "${hostname}:eth0:off\0" \
+ "nfsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addnfsargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "jffsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addjffsargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addubifsargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "mmcboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addmmcargs addipargs; setenv autostart yes;" \
+ "nboot.jffs2 90800000 0 ${kernel_offset}\0" \
+ "firmware_autoload=0\0" \
+ "flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
+ "nand erase ${uboot_offset} ${uboot_len};" \
+ "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+ "then nand lock; nand unlock ${env_offset};" \
+ "echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
+ "fi; \0" \
+ "flash_firmware=nand erase ${firmware_offset} ${firmware_len};" \
+ "if nand write.jffs2 ${fileaddr} ${firmware_offset}" \
+ " ${filesize};" \
+ "then echo Flashing of Firmware succeed;" \
+ "else echo Flashing of Firmware failed;" \
+ "fi\0" \
+ "fpga_config=tftpboot ${fileaddr} $firmware_name;" \
+ "run flash_firmware;" \
+ "fpga load 0 ${fileaddr} ${firmware_len};\0" \
+ "flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
+ "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "flash_reset_env=nand unlock ${env_offset} ${env_len};" \
+ "nand erase ${env_offset} ${env_len};" \
+ "echo Flash environment variables erased!\0" \
+ "download_uboot=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-u-boot.bin\0" \
+ "download_kernel=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-linux.bin\0" \
+ "download_rootfs=tftpboot ${loadaddr} " \
+ " ${serverpath}${board_name}-rootfs.ubi\0" \
+ "update_uboot=run download_uboot flash_uboot\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run download_kernel flash_kernel download_rootfs " \
+ "flash_rootfs download_uboot flash_uboot\0" \
+ "unlock_regs=mw 10000008 0; mw 10020008 0;TODO\0"
+
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
+
+#define CONFIG_SYS_AUTOLOAD "no"
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
+/*
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+*/
+
+#define CONFIG_NETMASK 255.255.255.0
+#define CONFIG_IPADDR 192.168.0.10
+#define CONFIG_BOARD_NAME "apf51"
+#define CONFIG_HOSTNAME "apf51"
+#define CONFIG_GATEWAYIP 192.168.0.1
+#define CONFIG_SERVERIP 192.168.0.2
+#define CONFIG_SRV_PATH ""
+#define CONFIG_ROOTPATH "/tftpboot/apf51-root"
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV /* ask for env variable */
+#define CONFIG_CMD_BSP /* Board Specific functions */
+#define CONFIG_CMD_CACHE /* icache, dcache */
+#define CONFIG_CMD_DHCP /* DHCP Support */
+#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
+#define CONFIG_CMD_I2C /* I2C serial bus support */
+#define CONFIG_CMD_IIM /* imx iim fuse */
+#undef CONFIG_CMD_IMLS /* List all found images */
+#define CONFIG_CMD_MTDPARTS /* MTD partition support */
+#define CONFIG_CMD_NAND /* NAND support */
+#define CONFIG_CMD_NAND_LOCK_UNLOCK
+#define CONFIG_CMD_NAND_TRIMFFS
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING /* ping support */
+
+/*
+ * Select some advanced features of the commande line parser
+ */
+
+#define CONFIG_BOOT_PARAMS_ADDR 0x90000100
+
+/**
+ * Miscellaneous configurable options
+ */
+#define CONFIG_SYS_LONGHELP /* undef to save memory */
+#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
+#define CONFIG_AUTO_COMPLETE /* Enable auto completion of */
+ /* commands using TAB */
+
+#define CONFIG_SYS_CBSIZE 1024 /* console I/O buffer */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+ /* print buffer size */
+#define CONFIG_SYS_MAXARGS 16 /* max command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+ /* boot args buf size */
+
+#define CONFIG_SYS_MEMTEST_START 0x90000000 /* memtest works on */
+#define CONFIG_SYS_MEMTEST_END 0x90100000 /* 1st MiB in DRAM */
+
+/*
+ * Default load address for user programs and kernel
+ */
+#define CONFIG_SYS_LOAD_ADDR 0x90000000
+#define CONFIG_LOADADDR 0x90000000
+
+#define CONFIG_SYS_HZ 1000 /* incrementer freq: 1 ms */
+
+/*
+ * Low Level Configuration Settings
+ * (address mappings, register initial values, etc.)
+ * You should know what you are doing if you make changes here.
+ */
+
+/*-----------------------------------------------------------------------
+ * Definitions for initial stack pointer and data area (in DPRAM)
+ */
+#define CONFIG_SYS_INIT_RAM_ADDR (IRAM_BASE_ADDR)
+#define CONFIG_SYS_INIT_RAM_SIZE (IRAM_SIZE)
+
+#define CONFIG_SYS_GBL_DATA_OFFSET \
+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_SP_ADDR \
+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+/*
+ * Malloc pool need to host env. + 2 MB reserve for other allocations.
+ */
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 * 1024 * 1024) )
+
+#ifdef CONFIG_USE_IRQ
+#define CONFIG_STACKSIZE (128<<10) /* stack size */
+#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
+#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
+#endif
+
+/*
+ * CPU Flash boot constants
+ */
+#ifndef CONFIG_DOWNLOAD_BY_DEBUGGER
+#define CONFIG_FLASH_HEADER
+#define CONFIG_FLASH_HEADER_OFFSET 0x400
+#define CONFIG_FLASH_HEADER_BARKER 0xB1
+#endif
+
+/*
+ * Enable the call to miscellaneous platform dependent initialization.
+ */
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_MISC_INIT_R
+#define CONFIG_BOARD_LATE_INIT
+
+/*
+ * Definitions related to passing arguments to kernel.
+ */
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+/*
+#define CONFIG_REVISION_TAG
+#define CONFIG_OF_LIBFDT
+*/
+/*
+ * SDRAM Configs
+ */
+#define CONFIG_NR_DRAM_BANKS 2
+#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_SYS_SDRAM_BASE CSD0_BASE_ADDR /* SDRAM bank #1 */
+#define PHYS_SDRAM_SIZE 256
+#define PHYS_SDRAM_1_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
+#define PHYS_SDRAM_2_SIZE (PHYS_SDRAM_SIZE) * 1024 * 1024
+
+/*
+ * FLASH organization
+ */
+#define CONFIG_SYS_MONITOR_OFFSET 0x00000000 /* offset in NAND */
+#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MB */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET 0x00100000 /* NAND offset */
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_RANGE 0x00100000 /* 1MB */
+#define CONFIG_ENV_OVERWRITE /* env is writable now */
+#define CONFIG_FIRMWARE_OFFSET 0x00200000
+#define CONFIG_FIRMWARE_LEN 0x00100000 /* 1MB */
+#define CONFIG_KERNEL_OFFSET 0x00300000
+#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
+#define CONFIG_ROOTFS_OFFSET 0x00B00000
+#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
+
+/*
+ * Configuration for no NOR FLASH memory
+ */
+#define CONFIG_SYS_NO_FLASH
+
+/*=====================*/
+/* Flash & Environment */
+/*=====================*/
+#define CONFIG_ENV_SECT_SIZE (128 * 1024)
+
+/*-----------------------------------------------------------------------
+ * NAND FLASH driver setup
+ */
+#define CONFIG_NAND_MXC_V2
+#define CONFIG_MXC_NAND_REGS_BASE 0xCFFF0000
+#define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_MXC_NAND_HWECC
+#define CONFIG_SYS_NAND_LARGEPAGE
+/*#define CONFIG_MTD_NAND_VERIFY_WRITE*/
+
+/*#define CONFIG_SYS_DIRECT_FLASH_TFTP*/
+#define CONFIG_FLASH_SHOW_PROGRESS 45
+#define NAND_MAX_CHIPS 1
+
+/*=====================*/
+
+#define CONFIG_NAND_U_BOOT
+/* Copy SPL+U-Boot here */
+#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR
+/* Size is the partion size */
+#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN
+/*
+#define CONFIG_NAND_ENV_DST
+#define CONFIG_ENV_OFFSET_REDUND
+*/
+
+/*
+ * Partitions & Filsystems
+ */
+#undef CONFIG_PARTITIONS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+/**
+ * I2C Configs
+ */
+#define CONFIG_HARD_I2C /* I2C with hardware support */
+#define CONFIG_I2C_MXC 1
+#define CONFIG_SYS_I2C_PORT I2C2_BASE_ADDR
+#define CONFIG_SYS_I2C_MX51_PORT2
+#define CONFIG_SYS_I2C_SPEED 400000
+#define CONFIG_SYS_I2C_SLAVE 0xfe
+
+/**
+ * RTC PMIC TODO TODO TODO TODO
+ */
+
+/*
+ * SD/MMC Configs
+ */
+
+/**
+ * SPI Configs
+ */
+
+/**
+ * Watchdog Config
+ */
+
+#define CONFIG_HW_WATCHDOG
+
+/**
+ * IIM fuse Config
+ */
+
+#define CONFIG_IMX_IIM
+#define CONFIG_IIM_MAC_BANK 1
+#define CONFIG_IIM_MAC_ROW 9
+
+/**
+ * GPIO: Support for MXC GPIO
+ */
+
+#define CONFIG_MXC_GPIO
+
+/**
+ * Ethernet: Support for internal Fast Ethernet Controller
+ */
+#define CONFIG_FEC_MXC
+#define IMX_FEC_BASE FEC_BASE_ADDR
+#define CONFIG_SYS_PHY_RESET_GPIO IOMUX_TO_GPIO(MX51_PIN_DI1_PIN11)
+
+#define CONFIG_FEC_MXC_PHYADDR 0x02
+#define CONFIG_MII
+#define CONFIG_DISCOVER_PHY
+
+/*-----------------------------------------------------------------------
+ * FPGA
+ */
+#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
+/*#define FPGA_DEBUG*/
+#define CONFIG_FPGA_COUNT 1
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA_SPARTAN3
+#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+#define CONFIG_SYS_FPGA_CHECK_CTRLC
+#define CONFIG_SYS_FPGA_CHECK_ERROR
+
+/* FPGA program pin configuration */
+#define ACFG_FPGA_PWR MX51_PIN_DI1_D0_CS
+#define ACFG_FPGA_PRG MX51_PIN_CSI2_D12
+#define ACFG_FPGA_RDATA CS1_BASE_ADDR
+#define ACFG_FPGA_WDATA CS1_BASE_ADDR
+#define ACFG_FPGA_INIT MX51_PIN_CSI2_D18
+#define ACFG_FPGA_DONE MX51_PIN_CSI2_D13
+#define ACFG_FPGA_SUSPEND MX51_PIN_DISPB2_SER_DIO
+
+#define ACFG_FPGA_GCR1_VALUE 0x019100bf
+#define ACFG_FPGA_GCR2_VALUE 0x00000000
+
+#define ACFG_FPGA_RCR1_VALUE 0x04000010
+#define ACFG_FPGA_RCR2_VALUE 0x00000000
+
+#define ACFG_FPGA_WCR1_VALUE 0x04000008
+#define ACFG_FPGA_WCR2_VALUE 0x00000000
+
+/*
+* Clocks configuration
+*/
+
+#define CONFIG_SYS_MX5_CLK32 32768
+#define CONFIG_SYS_MX5_HCLK 1024*CONFIG_SYS_MX5_CLK32
+#define CONFIG_MX51_PLL_ERRATA
+
+/* external bus frequencies */
+#define APF_DDR_CLK 200 /* MHZ DDR frequency from PLL1 */
+#define APF_ARM_CLK 800 /* MHZ CPU frequency from PLL1 */
+#define APF_AXIA_CLK 166 /* MHZ AXI A frequency from PLL2 */
+#define APF_AXIB_CLK 110 /* 110.8 133 MHZ AXI B frequency from PLL2 */
+#define APF_EMI_CLK 95 /* MHZ AHB frequency from PLL2 */
+#define APF_AHB_CLK 133 /* MHZ AHB frequency from PLL2 */
+#define APF_IPG_CLK 66 /* 66.5 MHZ IPG frequency from PLL2 */
+#define APF_PERCLK 55 /* 55.4 MHZ PERCLK frequency */
+#define APF_NFC_CLK 23 /* MHZ NFC Clock from EMI clk */
+#define APF_USB_CLK 54 /* external USB serial bus frequency PLL3 */
+#define APF_ESDHC_CLK 54 /* MHz ESDHC controller frequency / PLL3 */
+#define APF_UART_CLK 66 /* 66.5 MHz UART frequency from PLL2 */
+
+//#define APF_SSI_CLK 54 /* MHz SSI controller frequency */
+//#define APF_TVE_CLK 216 /* MHz TVE controller frequency */
+//#define APF_DI_CLK 0 /* MHz DISPLAY controller frequency*/
+//#define APF_VPU_CLK 0 /* MHz VPU controller frequency*/
+//#define APF_SPDIF_CLK 10 /* MHz SPDIF controller frequency 10.3 MHz*/
+//#define APF_SIM_CLK 54 /* MHz SIM controller frequency */
+//#define APF_FIRI_CLK 54 /* MHz FIRI controller frequency */
+//#define APF_HSI2C_CLK 54 /* MHz HS I2C controller frequency */
+//#define APF_CSI_CLK 54 /* MHz HS CSI controller frequency */
+//#define APF_ECSPI_CLK 54 /* MHz HECSPI controller frequency */
+//#define APF_WRCK_CLK 13 /* MHz WRCK 13.3 MHz */
+//#define APF_LPSR_CLK 0 /* MHz */
+#define APF_PGC_CLK 66 /* MHz 66.5 MHz */
+
+/**
+ * iMX51 PLL constants
+ */
+
+/* PLL parameters assuming 32.768kHz *1024 input clock with doubler ON */
+/* MFI PDF */
+#define DP_OP_864 ((11 << 4) + ((2 - 1) << 0))
+#define DP_MFD_864 (65536 - 1)
+#define DP_MFN_864 122854
+#define DP_MFN_800_DIT 60354
+
+#define DP_OP_850 ((6 << 4) + ((1 - 1) << 0))
+#define DP_MFD_850 (1048576 - 1)
+#define DP_MFN_850 349169
+
+#define ACFG_PLL1_CLK 800 /* MHz */
+#define DP_OP_800 ((11 << 4) + ((2 - 1) << 0))
+#define DP_MFD_800 (65536 - 1)
+#define DP_MFN_800 60354
+
+#define ACFG_PLL2_CLK 665 /* MHz */
+#define DP_OP_665 ((14 << 4) + ((3 - 1) << 0))
+#define DP_MFD_665 (2097152 - 1)
+#define DP_MFN_665 1811747
+
+#define ACFG_PLL3_CLK 216 /* MHz */
+#define DP_OP_216 ((8 << 4) + ((5 - 1) << 0))
+#define DP_MFD_216 (262144 - 1)
+#define DP_MFN_216 12223
+
+/*-----------------------------------------------------------------------
+ * Physical Memory Map
+ */
+
+#define CONFIG_SYS_DDR_CLKSEL 0
+
+/*
+ * Hardware drivers
+ */
+
+/*-----------------------------------------------------------------------
+ * WEIM - EIM
+ */
+ /* force BCLK free run */
+#define ACFG_WCR_VALUE 0x00000021
+#define ACFG_WIAR_VALUE 0x00000010
+
+/* CS1 */
+#define ACFG_CS1GCR1_VALUE ACFG_FPGA_GCR1_VALUE
+#define ACFG_CS1GCR2_VALUE ACFG_FPGA_GCR2_VALUE
+
+#define ACFG_CS1RCR1_VALUE ACFG_FPGA_RCR1_VALUE
+#define ACFG_CS1RCR2_VALUE ACFG_FPGA_RCR2_VALUE
+
+#define ACFG_CS1WCR1_VALUE ACFG_FPGA_WCR1_VALUE
+#define ACFG_CS1WCR2_VALUE ACFG_FPGA_WCR2_VALUE
+
+/* CS2 */
+#define ACFG_CS2GCR1_VALUE 0x00010080
+#define ACFG_CS2GCR2_VALUE 0x00000000
+
+#define ACFG_CS2RCR1_VALUE 0x00000000
+#define ACFG_CS2RCR2_VALUE 0x00000000
+
+#define ACFG_CS2WCR1_VALUE 0x00000000
+#define ACFG_CS2WCR2_VALUE 0x00000000
+
+/* CS3 */
+#define ACFG_CS3GCR1_VALUE 0x00010080
+#define ACFG_CS3GCR2_VALUE 0x00000000
+
+#define ACFG_CS3RCR1_VALUE 0x00000000
+#define ACFG_CS3RCR2_VALUE 0x00000000
+
+#define ACFG_CS3WCR1_VALUE 0x00000000
+#define ACFG_CS3WCR2_VALUE 0x00000000
+
+/* CS4 */
+#define ACFG_CS4GCR1_VALUE 0x00010080
+#define ACFG_CS4GCR2_VALUE 0x00000000
+
+#define ACFG_CS4RCR1_VALUE 0x00000000
+#define ACFG_CS4RCR2_VALUE 0x00000000
+
+#define ACFG_CS4WCR1_VALUE 0x00000000
+#define ACFG_CS4WCR2_VALUE 0x00000000
+
+/* CS5 */
+#define ACFG_CS5GCR1_VALUE 0x00010080
+#define ACFG_CS5GCR2_VALUE 0x00000000
+
+#define ACFG_CS5RCR1_VALUE 0x00000000
+#define ACFG_CS5RCR2_VALUE 0x00000000
+
+#define ACFG_CS5WCR1_VALUE 0x00000000
+#define ACFG_CS5WCR2_VALUE 0x00000000
+
+#include <asm/arch/imx-regs.h>
+
+/*
+ * From here, there should not be any user configuration.
+ * All Equations are automatic
+ */
+
+/**
+ * SDRAM controler configs
+ *
+ * ACFG_SDRAM_NUM_COL 8, 9, 10 or 11 column address bits
+ * ACFG_SDRAM_NUM_ROW 11, 12 or 13 row address bits
+ * ACFG_SDRAM_REFRESH 0=OFF 1=2048 2=4096 3=8192.. refresh
+ * ACFG_SDRAM_XSR_DELAY ns Exit self refresh to any command (>= 25 ddr_clk)
+ * ACFG_SDRAM_EXIT_PWD ns exit power down delay
+ * ACFG_SDRAM_W2R_DELAY WRITE to READ Command Delay 0=1ck 1=2ck
+ * ACFG_SDRAM_ROW_PRECHARGE_DELAY ns (>2 x ddr_clk)
+ * ACFG_SDRAM_TMRD_DELAY Load mode register cycle delay 1..4
+ * ACFG_SDRAM_TWR_DELAY DDR: 0=2ck 1=3ck
+ * ACFG_SDRAM_RAS_DELAY ns ACTIVE-to-PRECHARGE delay
+ * ACFG_SDRAM_RRD_DELAY ns ACTIVE-to-ACTIVE delay
+ * ACFG_SDRAM_RCD_DELAY ns Row to Column delay
+ * ACFG_SDRAM_RC_DELAY ns Row cycle delay (tRFC refresh to command)
+ * ACFG_SDRAM_RFC_DELAY ns (> 10xddr_clk) auto refresh to any command
+ * ACFG_SDRAM_PARTIAL_ARRAY_SR 0=full 1=half 2=quater 3=Eighth 4=Sixteenth
+ * ACFG_SDRAM_DRIVE_STRENGH 0=Full-strength 1=half 2=quater 3=Eighth
+ * ACFG_SDRAM_BURST_LENGTH 2^N BYTES (N=0..3)
+ * ACFG_SDRAM_SINGLE_ACCESS 1= single access; 0 = Burst mode
+ *
+ */
+
+#if (PHYS_SDRAM_SIZE == 64) /* micron MT46H16M32LF -6 */
+/* micron 64MB */
+#define ACFG_SDRAM_NUM_COL 9 /* 8..11 column address bits */
+#define ACFG_SDRAM_NUM_ROW 13 /* 11..13 row address bits */
+#define ACFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192.*/
+#define ACFG_SDRAM_XSR_DELAY 138 /* ns Exit self refresh */
+#define ACFG_SDRAM_EXIT_PWD 10 /* ns exit power down delay */
+#define ACFG_SDRAM_W2R_DELAY 1 /* 0=1ck 1=2ck */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 15 /* ns (>2 x ddr_clk) */
+#define ACFG_SDRAM_TMRD_DELAY 2 /* 1..4 */
+#define ACFG_SDRAM_TWR_DELAY 1 /* DDR: 0=2ck 1=3ck */
+#define ACFG_SDRAM_RAS_DELAY 40 /* ns ACTIVE-to-PRECHARGE*/
+#define ACFG_SDRAM_RRD_DELAY 10 /* ns ACTIVE-to-ACTIVE delay*/
+#define ACFG_SDRAM_RCD_DELAY 15 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY 55 /* ns Row cycle delay */
+#define ACFG_SDRAM_RFC_DELAY 110 /* ns (> 10xddr_clk) */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0..4 */
+#define ACFG_SDRAM_DRIVE_STRENGH 0 /* 0..3 */
+#define ACFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS 0 /* 0..1 */
+#endif
+
+#if (PHYS_SDRAM_SIZE == 128)
+/* micron 128MB */
+#define ACFG_SDRAM_NUM_COL 10 /* 8..11 column address bits */
+#define ACFG_SDRAM_NUM_ROW 13 /* 11..13 row address bits */
+#define ACFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192.*/
+#define ACFG_SDRAM_XSR_DELAY 138 /* ns Exit self refresh */
+#define ACFG_SDRAM_EXIT_PWD 10 /* ns exit power down delay */
+#define ACFG_SDRAM_W2R_DELAY 1 /* 0=1ck 1=2ck */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 15 /* ns (>2 x ddr_clk) */
+#define ACFG_SDRAM_TMRD_DELAY 2 /* 1..4 */
+#define ACFG_SDRAM_TWR_DELAY 1 /* DDR: 0=2ck 1=3ck */
+#define ACFG_SDRAM_RAS_DELAY 40 /* ns ACTIVE-to-PRECHARGE */
+#define ACFG_SDRAM_RRD_DELAY 10 /* ns ACTIVE-to-ACTIVE delay */
+#define ACFG_SDRAM_RCD_DELAY 15 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY 55 /* ns Row cycle delay */
+#define ACFG_SDRAM_RFC_DELAY 110 /* ns (> 10xddr_clk) */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0..4 */
+#define ACFG_SDRAM_DRIVE_STRENGH 0 /* 0..3 */
+#define ACFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS 0 /* 0..1 */
+#endif
+
+#if (PHYS_SDRAM_SIZE == 256)
+/* micron 256MB */
+#define ACFG_SDRAM_NUM_COL 10 /* 8..11 column address bits */
+#define ACFG_SDRAM_NUM_ROW 14 /* 11..13 row address bits */
+#define ACFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192.*/
+#define ACFG_SDRAM_XSR_DELAY 125 /* ns Exit self refresh */
+#define ACFG_SDRAM_EXIT_PWD 10 /* ns exit power down delay */
+#define ACFG_SDRAM_W2R_DELAY 1 /* 0=1ck 1=2ck */
+#define ACFG_SDRAM_ROW_PRECHARGE_DELAY 15 /* ns (>2 x ddr_clk) */
+#define ACFG_SDRAM_TMRD_DELAY 2 /* 1..4 */
+#define ACFG_SDRAM_TWR_DELAY 1 /* DDR: 0=2ck 1=3ck */
+#define ACFG_SDRAM_RAS_DELAY 40 /* ns ACTIVE-to-PRECHARGE */
+#define ACFG_SDRAM_RRD_DELAY 10 /* ns ACTIVE-to-ACTIVE delay */
+#define ACFG_SDRAM_RCD_DELAY 15 /* ns Row to Column delay */
+#define ACFG_SDRAM_RC_DELAY 55 /* ns Row cycle delay */
+#define ACFG_SDRAM_RFC_DELAY 72 /* ns (> 10xddr_clk) */
+#define ACFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0..4 */
+#define ACFG_SDRAM_DRIVE_STRENGH 0 /* 0..3 */
+#define ACFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
+#define ACFG_SDRAM_SINGLE_ACCESS 0 /* 0..1 */
+#endif
+
+/* Issue Mode register Command to SDRAM*/
+#define ACFG_DRR_MR_VAL ( 0x0\
+ | (((ACFG_SDRAM_BURST_LENGTH)&0x7)<<(0))\
+ | ((3)<<(4)) \
+ | (((ACFG_SDRAM_SINGLE_ACCESS)&0x1)<<(3)))
+
+/* Issue Extended Mode register Command to SDRAM*/
+#define ACFG_DRR_EMR_VAL\
+ (((ACFG_SDRAM_PARTIAL_ARRAY_SR&0x7)<<0)\
+ | ((ACFG_SDRAM_DRIVE_STRENGH&0x7)<<(5)))
+
+#define ACFG_SDRAM_ESDGPR_REGISTER_VAL 0x20020000
+#define ACFG_SDRAM_ESDCDLY1_REGISTER_VAL 0x00F48000
+#define ACFG_SDRAM_ESDCDLY2_REGISTER_VAL 0x00F48000
+#define ACFG_SDRAM_ESDCDLY3_REGISTER_VAL 0x00F48000
+#define ACFG_SDRAM_ESDCDLY4_REGISTER_VAL 0x00F48000
+#define ACFG_SDRAM_ESDCDLY5_REGISTER_VAL 0x00F48000
+
+/* SDRAM IO Muxing */
+#define ACFG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
+#define ACFG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
+#define ACFG_IOMUX_PAD_DRAM_SDWE \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+#define ACFG_IOMUX_PAD_DRAM_SDCKE0 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+#define ACFG_IOMUX_PAD_DRAM_SDCKE1 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+#define ACFG_IOMUX_PAD_DRAM_SDCLK \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_FAST
+#define ACFG_IOMUX_PAD_DRAM_SDQS0 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_SDQS1 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_SDQS2 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_SDQS3 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_CS0 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+#define ACFG_IOMUX_PAD_DRAM_CS1 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_PAD_DRAM_DQM0 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_DQM1 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_DQM2 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_DQM3 \
+ PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+ +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+
+#define ACFG_IOMUX_PAD_EIM_SDBA2 \
+ PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PU
+#define ACFG_IOMUX_PAD_EIM_SDODT1 \
+ PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
+#define ACFG_IOMUX_PAD_EIM_SDODT0 \
+ PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
+
+#define ACFG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_PULL /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_INDDR PAD_CTL_DDR_INPUT_CMOS /* imx default */
+#define ACFG_IOMUX_GRP_PKEDDR PAD_CTL_PKE_ENABLE /* imx default */
+#define ACFG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MEDIUM /* imx default */
+#define ACFG_IOMUX_GRP_DDRAPUS PAD_CTL_100K_PU /* imx default */
+#define ACFG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE /* imx default */
+#define ACFG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE /* imx default */
+#define ACFG_IOMUX_GRP_HYSDDR2 PAD_CTL_HYS_NONE /* imx default */
+#define ACFG_IOMUX_GRP_HVDDR PAD_CTL_DRV_VOT_LOW
+#define ACFG_IOMUX_GRP_HYSDDR3 PAD_CTL_HYS_NONE /* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_B0 PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_GRP_DDRAPKS PAD_CTL_PUE_PULL /* imx default */
+
+#define ACFG_IOMUX_GRP_DDR_SR_B1 PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_GRP_DDRPUS PAD_CTL_100K_PU /* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_B2 PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_GRP_PKEADDR PAD_CTL_PKE_ENABLE /* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_B4 PAD_CTL_SRE_SLOW
+
+#define ACFG_IOMUX_GRP_INMODE1 PAD_CTL_DDR_INPUT_CMOS /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_HIGH /* imx default */
+
+#define ACFG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_FAST/* imx default */
+
+#define ACFG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_HIGH /* imx default */
+
+#define ACFG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_FAST/* imx default */
+/* end of SDRAM IO Muxing */
+
+/* CCM Configuration */
+
+#define CONFIG_SYS_PLL_DP_CTL 0x00001332 /* use fpm_clk */
+#define CONFIG_SYS_CLKCTL_CCMR 0x00001FFF
+#define CONFIG_SYS_CLKCTL_CSR 0x0000003E
+#define CONFIG_SYS_CLKCTL_CCSR 0x00000200
+
+#define CCBDR_MASK 0x40000000
+
+#define CONFIG_SYS_CLKTL_CBCDR\
+ (CCBDR_MASK \
+ |((((ACFG_PLL1_CLK/APF_DDR_CLK)-1)&0x07)<<27) \
+ |((((ACFG_PLL2_CLK/APF_EMI_CLK)-1)&0x07)<<22) \
+ |((((ACFG_PLL2_CLK/APF_AXIB_CLK)-1)&0x07)<<19) \
+ |((((ACFG_PLL2_CLK/APF_AXIA_CLK)-1)&0x07)<<16) \
+ |((((APF_EMI_CLK/APF_NFC_CLK)-1)&0x07)<<13) \
+ |((((ACFG_PLL2_CLK/APF_AHB_CLK)-1)&0x07)<<10) \
+ |((((APF_AHB_CLK/APF_IPG_CLK)-1)&0x03)<<8) \
+ |(((((ACFG_PLL2_CLK/APF_PERCLK)/8))&0x03)<<6) \
+ |(((((ACFG_PLL2_CLK/APF_PERCLK) \
+ /((ACFG_PLL2_CLK/APF_PERCLK)/8+1))-1)&0x07)<<0)\
+ )
+
+#define CONFIG_SYS_CLKTL_CBCMR 0x000020C0
+
+#define CONFIG_SYS_CLKTL_CBCMR1 0xA5A2A020
+
+#define CONFIG_SYS_CLKTL_CSCDR1\
+ ( 0x0 \
+ |((((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8)&0x07)<<19) \
+ |(((((ACFG_PLL3_CLK/APF_ESDHC_CLK) \
+ /((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8+1))-1)&0x07)<<22) \
+ |((((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8)&0x07)<<11) \
+ |((((APF_IPG_CLK/APF_PGC_CLK)-1)&0x07)<<14) \
+ |(((((ACFG_PLL3_CLK/APF_ESDHC_CLK) \
+ /((ACFG_PLL3_CLK/APF_ESDHC_CLK)/8+1))-1)&0x07)<<16) \
+ |((((ACFG_PLL3_CLK/APF_USB_CLK)/4)&0x07)<<6) \
+ |(((((ACFG_PLL3_CLK/APF_USB_CLK) \
+ /((ACFG_PLL3_CLK/APF_USB_CLK)/4+1))-1)&0x03)<<8) \
+ |((((ACFG_PLL2_CLK/APF_UART_CLK)/8)&0x07)<<0) \
+ |(((((ACFG_PLL2_CLK/APF_UART_CLK) \
+ /((ACFG_PLL2_CLK/APF_UART_CLK)/8+1))-1)&0x07)<<3) \
+ )
+
+/* clock cycle time with x2 for a 0.5ns accuracy */
+#define CONFIG_SYS_2XDDRCLK_LGTH (2000/APF_DDR_CLK) /* ns */
+
+#define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5680
+
+#if ((2*ACFG_SDRAM_RC_DELAY)>(16*CONFIG_SYS_2XDDRCLK_LGTH))
+#define REG_FIELD_RC_VAL 0
+#else
+#define REG_FIELD_RC_VAL \
+ (((2*ACFG_SDRAM_RC_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1) \
+ /CONFIG_SYS_2XDDRCLK_LGTH)-1)
+#endif
+
+#if ((2*ACFG_SDRAM_RFC_DELAY)>(25*CONFIG_SYS_2XDDRCLK_LGTH))
+#define REG_FIELD_RFC_VAL \
+ (((2*ACFG_SDRAM_RFC_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1) \
+ /CONFIG_SYS_2XDDRCLK_LGTH/2)-10)
+#define REG_FIELD_ESDCTL_PAT 0x80820000
+#else
+#define REG_FIELD_RFC_VAL \
+ (((2*ACFG_SDRAM_RFC_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1) \
+ /CONFIG_SYS_2XDDRCLK_LGTH)-10)
+#define REG_FIELD_ESDCTL_PAT 0x80020000
+#endif
+
+/* ESDCTLx Configuration Registers: 32bits */
+#define ACFG_SDRAM_ESDCTL_REGISTER_VAL (REG_FIELD_ESDCTL_PAT\
+ | (((ACFG_SDRAM_REFRESH)&0x0F)<<28)\
+ | (((ACFG_SDRAM_NUM_ROW-11)&0x7)<<24)\
+ | (((ACFG_SDRAM_NUM_COL-8)&0x3)<<20))
+
+#define ACFG_SDRAM_ESDCFG_REGISTER_VAL (0x00000000\
+ | ((REG_FIELD_RFC_VAL&0x0F)<<28)\
+ | (((((2*ACFG_SDRAM_XSR_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-25)&0x0F)<<24)\
+ | (((((2*ACFG_SDRAM_EXIT_PWD+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-1)&0x7)<<20)\
+ | ((ACFG_SDRAM_W2R_DELAY)<<20)\
+ | (((((2*ACFG_SDRAM_ROW_PRECHARGE_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-2)&0x3)<<18)\
+ | (((ACFG_SDRAM_TMRD_DELAY-1)&0x3)<<16)\
+ | (((((2*ACFG_SDRAM_RAS_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-1)&0x0F)<<12)\
+ | (((((2*ACFG_SDRAM_RRD_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-1)&0x3)<<10)\
+ | (((ACFG_SDRAM_TWR_DELAY)&0x1)<<7)\
+ | (((((2*ACFG_SDRAM_RCD_DELAY+CONFIG_SYS_2XDDRCLK_LGTH-1)\
+ /CONFIG_SYS_2XDDRCLK_LGTH)-1)&0x7)<<4)\
+ | (((REG_FIELD_RC_VAL)&0x0F)<<0))
+
+#endif /* __CONFIG_H */
diff --git a/patches/buildroot/2011.05/173-u-boot-add-variable-to-check-number-of-ram-at-runtime.patch b/patches/buildroot/2011.05/173-u-boot-add-variable-to-check-number-of-ram-at-runtime.patch
new file mode 100644
index 0000000..27f2165
--- /dev/null
+++ b/patches/buildroot/2011.05/173-u-boot-add-variable-to-check-number-of-ram-at-runtime.patch
@@ -0,0 +1,23 @@
+U-Boot: Add config option to check number of RAM at runtime.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+
+Index: buildroot/boot/u-boot/u-boot.mk
+===================================================================
+--- buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:14:25.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2012-02-21 00:36:06.969559196 +0100
+@@ -156,11 +156,12 @@ ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE)
+ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
+ $(U_BOOT_INC_CONF_FILE)
+ endif
+-ifneq ($(BR2_TARGET_ARMADEUS_NR_SDRAM),)
++ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),"1")
+ $(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+ $(U_BOOT_INC_CONF_FILE)
+ $(SED) "s,^#define CONFIG_SYS_NR_DRAM_BANKS.*,#define CONFIG_SYS_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+ $(U_BOOT_INC_CONF_FILE)
++ $(call insert_define, CONFIG_NR_DRAM_POPULATED, $(BR2_TARGET_ARMADEUS_NR_SDRAM))
+ endif
+ touch $@
+
diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index cd68739..9818093 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-custom/board/armadeus/apf51/apf51.c 2012-01-12 17:19:58.434303119 +0100
-@@ -0,0 +1,1221 @@
+@@ -0,0 +1,1242 @@
+/*
+ * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
+ *
@@ -72,27 +72,48 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ return amount_loaded;
+}
+
-+int dram_init(void)
++u32 get_board_rev(void)
+{
-+ u32 size1, size2 = 0;
+
-+ size1 = get_ram_size((void *)CSD0_BASE_ADDR, PHYS_SDRAM_1_SIZE);
-+#if ( CONFIG_NR_DRAM_BANKS > 1 )
-+ size2 = get_ram_size((void *)CSD1_BASE_ADDR, PHYS_SDRAM_2_SIZE);
-+#endif
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++
++ return readl(&iim->bank[1].fuse_regs[0x0f]) & 0x1f;
++}
++
++int get_num_ram_bank(void)
++{
++ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
++ int nr_dram_banks = 1;
++
++ if ((get_board_rev() > 0) && (CONFIG_NR_DRAM_BANKS > 1))
++ nr_dram_banks += readl(&iim->bank[1].fuse_regs[0x10]) & 0x01;
++ else
++ nr_dram_banks = CONFIG_NR_DRAM_POPULATED;
++
++ return nr_dram_banks;
++}
++
++int dram_init(void)
++{
++
++ gd->ram_size = get_ram_size((void *)CSD0_BASE_ADDR, PHYS_SDRAM_1_SIZE);
++ if (get_num_ram_bank() > 1) {
++ gd->ram_size +=
++ get_ram_size((void *)CSD1_BASE_ADDR, PHYS_SDRAM_2_SIZE);
++ }
+
-+ gd->ram_size = size1 + size2;
+ return 0;
+}
+
+void dram_init_banksize(void)
+{
+ gd->bd->bi_dram[0].start = CSD0_BASE_ADDR;
-+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-+#if ( CONFIG_NR_DRAM_BANKS > 1 )
-+ gd->bd->bi_dram[1].start = CSD1_BASE_ADDR;
-+ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-+#endif
++ gd->bd->bi_dram[0].size = gd->ram_size / get_num_ram_bank();
++ if (CONFIG_NR_DRAM_BANKS > 1) {
++ gd->bd->bi_dram[1].start = CSD1_BASE_ADDR;
++ gd->bd->bi_dram[1].size = gd->ram_size -gd->bd->bi_dram[0].size;
++ }
++
+}
+
+void setup_usb(void)
@@ -989,7 +1010,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+
+int checkboard(void)
+{
-+ printf("Board: Armadeus APF51\n");
++ printf("Board: Armadeus APF51 revision %d\n", get_board_rev());
+ return 0;
+}
+
@@ -1183,7 +1204,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ ACFG_SDRAM_ESDCTL_REGISTER_VAL);
+ printf(dcd_item, i++, 4, &esdctl->esdcfg0,
+ ACFG_SDRAM_ESDCFG_REGISTER_VAL);
-+#if (CONFIG_NR_DRAM_BANKS > 1)
++
+ printf(dcd_item, i++, 4, &esdctl->esdctl1,
+ (ACFG_SDRAM_ESDCTL_REGISTER_VAL & 0x8FFFFFFF));
+ printf(dcd_item, i++, 4, &esdctl->esdscr, DRR_PRECHARGE_CMD(1, 0));
@@ -1198,7 +1219,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
+ ACFG_SDRAM_ESDCTL_REGISTER_VAL);
+ printf(dcd_item, i++, 4, &esdctl->esdcfg1,
+ ACFG_SDRAM_ESDCFG_REGISTER_VAL);
-+#endif /* CONFIG_NR_DRAM_BANKS > 1 */
++
+ printf(dcd_item, i++, 4, &esdctl->esdmisc,
+ ACFG_SDRAM_ESDMISC_REGISTER_VAL);
+ printf(dcd_item, i++, 4, &esdctl->esdscr, 0x00000000);
diff --git a/patches/u-boot/2011.12/409-apf51-nand-spl.patch b/patches/u-boot/2011.12/409-apf51-nand-spl.patch
index e9235bb..fdbae9f 100644
--- a/patches/u-boot/2011.12/409-apf51-nand-spl.patch
+++ b/patches/u-boot/2011.12/409-apf51-nand-spl.patch
@@ -50,7 +50,7 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/flash_header.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2010.03/nand_spl/board/armadeus/apf51/flash_header.S 2011-01-05 18:11:55.000000000 +0100
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,208 @@
+/*
+ *
+ * Copyright (c) 2010-2012 Eric Jarrige, Armadeus Project
@@ -223,7 +223,6 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/flash_header.S
+ ACFG_SDRAM_ESDCFG_REGISTER_VAL)
+
+/* Init DDR on CS1 */
-+#if (CONFIG_NR_DRAM_BANKS > 1)
+MXC_DCD_ITEM(54, 4, ESDCTL_BASE_ADDR + ESDCTL_ESDCTL1, \
+ (ACFG_SDRAM_ESDCTL_REGISTER_VAL&0x8FFFFFFF))
+MXC_DCD_ITEM(55, 4, ESDCTL_BASE_ADDR + ESDCTL_ESDSCR, DRR_PRECHARGE_CMD(1, 0))
@@ -238,7 +237,6 @@ Index: u-boot-2010.03/nand_spl/board/armadeus/apf51/flash_header.S
+ ACFG_SDRAM_ESDCTL_REGISTER_VAL)
+MXC_DCD_ITEM(62, 4, ESDCTL_BASE_ADDR + ESDCTL_ESDCFG1, \
+ ACFG_SDRAM_ESDCFG_REGISTER_VAL)
-+#endif /* CONFIG_NR_DRAM_BANKS > 1 */
+
+MXC_DCD_ITEM(63, 4, ESDCTL_BASE_ADDR + ESDCTL_ESDMISC, \
+ ACFG_SDRAM_ESDMISC_REGISTER_VAL)
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-20 21:50:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9deef899fd3d76d87802e264989f1709cacf1308 (commit)
from bcaff153460985f4a2c1eb6b40ef60658326d2e2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9deef899fd3d76d87802e264989f1709cacf1308
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 20 22:50:07 2012 +0100
[UBOOT] apf27: add fpga patch to release 2011.12
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 30 +-
...-Add-support-for-the-armadeus-apf27-board.patch | 318 +++++++++++++++++++-
.../2011.12/303-Remove-useless-code-in-apf27.patch | 76 -----
...6-Debug-nand-this-patch-should-be-removed.patch | 79 -----
4 files changed, 331 insertions(+), 172 deletions(-)
delete mode 100644 patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
delete mode 100644 patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 33f83e8..148e345 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -80,16 +80,14 @@
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-// #define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+//#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DIAG /* Diagnostics */
//#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-#define CONFIG_CMD_ELF /* bootelf, bootvx */
#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_EXT2 /* EXT2 Support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
//#define CONFIG_CMD_I2C /* I2C serial bus support */
-#undef CONFIG_CMD_IMLS /* List all found images */
+#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_MII /* MII support */
@@ -224,7 +222,8 @@
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
#define CONFIG_BOOTCOMMAND "run ubifsboot"
-#define CONFIG_SYS_AUTOLOAD "no"
+#define CFG_AUTOLOAD "no"
+#define CFG_DIRECT_FLASH_TFTP
#define CONFIG_MACH_TYPE MACH_TYPE_APF27
#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
@@ -267,7 +266,7 @@
#undef CONFIG_VFD /* do not send framebuffer setup */
/*
- * Malloc pool need to host env + 128 Kb reserve for other allocations.
+ * Malloc pool need to host env + 512 Kb reserve for other allocations.
*/
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10) )
@@ -358,7 +357,7 @@
/*
* SDRAM definition parameter
*/
-#define CONFIG_NR_DRAM_BANKS 2
+#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
@@ -640,12 +639,11 @@
/*-----------------------------------------------------------------------
* FPGA stuff
*/
-// #define CONFIG_FPGA CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
//#define FPGA_DEBUG
-#define CONFIG_FPGA_COUNT 2
+#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_FPGA_SPARTAN6
#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
@@ -669,14 +667,14 @@
* I2C bus
*/
-// #define CONFIG_HARD_I2C 1 /* I2C with hardware support */
+//#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-// #define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
-// #define CONFIG_SYS_I2C_SLAVE 0x7F
+//#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
+//#define CONFIG_SYS_I2C_SLAVE 0x7F
-// #define CONFIG_I2C_CMD_TREE
-// #define CONFIG_I2C_MULTI_BUS 2
-// #define CONFIG_SYS_I2C_NOPROBES { }
+//#define CONFIG_I2C_CMD_TREE
+//#define CONFIG_I2C_MULTI_BUS 2
+//#define CONFIG_SYS_I2C_NOPROBES { }
# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
diff --git a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
index 45dd049..577b8d1 100644
--- a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -51,7 +51,7 @@ index 0000000..2a0f7d8
+
+LIB = $(obj)lib$(BOARD).o
+
-+COBJS := apf27.o
++COBJS := apf27.o fpga.o
+SOBJS := lowlevel_init.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
@@ -745,4 +745,320 @@ index 66c27a4..f68c3a7 100644
at91sam9260ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS1
at91sam9260ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_NANDFLASH
1.7.4.4
+Index: u-boot-2010.03/board/armadeus/apf27/fpga.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2010.03/board/armadeus/apf27/fpga.c 2011-01-05 18:09:44.000000000 +0100
+@@ -0,0 +1,267 @@
++/*
++ * (C) Copyright 2002-2008
++ * Eric Jarrige <eri...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * 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 <common.h>
++
++#if defined(CONFIG_FPGA)
++
++#include <asm/arch/imx-regs.h>
++#include <asm/io.h>
++#include <command.h>
++#include <config.h>
++#include "fpga.h"
++#include <spartan3.h>
++
++#define GPIO_PORT(x) ((x & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT)
++#define GPIO_SET(x) writel(readl(&gpregs->port[GPIO_PORT(x)].dr) | (1 << (x & GPIO_PIN_MASK)), \
++ &gpregs->port[GPIO_PORT(x)].dr)
++//(DR(GPIO_PORT(x)) |= (1<<(x & GPIO_PIN_MASK)))
++#define GPIO_CLEAR(x) writel(readl(&gpregs->port[GPIO_PORT(x)].dr) & ~(1 << (x & GPIO_PIN_MASK)), \
++ &gpregs->port[GPIO_PORT(x)].dr)
++//(DR(GPIO_PORT(x)) &= ~(1<<(x & GPIO_PIN_MASK)))
++#define GPIO_WRITE(x,y) ( y ? GPIO_SET(x) : GPIO_CLEAR(x) )
++#define GPIO_READ(x) ((readl(&gpregs->port[GPIO_PORT(x)].ssr) & (1 << (x & GPIO_PIN_MASK))) \
++ >> (x & GPIO_PIN_MASK))
++//((SSR (GPIO_PORT(x)) & (1<<(x & GPIO_PIN_MASK)))>> (x & GPIO_PIN_MASK))
++#ifdef FPGA_DEBUG
++#define PRINTF(fmt,args...) printf (fmt ,##args)
++#else
++#define PRINTF(fmt,args...)
++#endif
++
++/* Note that these are pointers to code that is in Flash. They will be
++ * relocated at runtime.
++ * Spartan2 code is used to download our Spartan 3 :) code is compatible.
++ * Just take care about the file size
++*/
++Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
++ fpga_pre_fn,
++ fpga_pgm_fn,
++ fpga_init_fn,
++ NULL,
++ fpga_done_fn,
++ fpga_clk_fn,
++ fpga_cs_fn,
++ fpga_wr_fn,
++ fpga_rdata_fn,
++ fpga_wdata_fn,
++ fpga_busy_fn,
++ fpga_abort_fn,
++ fpga_post_fn,
++};
++
++Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {Xilinx_Spartan3,
++ slave_parallel,
++ 1196128l/8,
++ (void *) &fpga_fns,
++ 0}
++};
++
++/*
++ * nitialize GPIO port B before download
++ */
++int
++fpga_pre_fn (int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ // Initialize GPIO pins
++ GPIO_SET(CONFIG_SYS_FPGA_PWR);
++ imx_gpio_mode (CONFIG_SYS_FPGA_INIT | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_DONE | GPIO_IN | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_PRG | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_CLK | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_RW | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_CS | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_SUSPEND | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ GPIO_SET(CONFIG_SYS_FPGA_RESET);
++ imx_gpio_mode (CONFIG_SYS_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ imx_gpio_mode (CONFIG_SYS_FPGA_PWR | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ GPIO_SET(CONFIG_SYS_FPGA_PRG);
++ GPIO_SET(CONFIG_SYS_FPGA_CLK);
++ GPIO_SET(CONFIG_SYS_FPGA_RW);
++ GPIO_SET(CONFIG_SYS_FPGA_CS);
++ GPIO_CLEAR(CONFIG_SYS_FPGA_SUSPEND);
++// GPIO_CLEAR(CONFIG_SYS_FPGA_RESET);
++ GPIO_CLEAR(CONFIG_SYS_FPGA_PWR);
++
++ return cookie;
++}
++
++/*
++ * Set the FPGA's active-low program line to the specified level
++ */
++int
++fpga_pgm_fn (int assert, int flush, int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: FPGA PROGRAM %s", __FUNCTION__, __LINE__,
++ assert?"high":"low");
++ GPIO_WRITE( CONFIG_SYS_FPGA_PRG, !assert);
++ return assert;
++}
++
++/*
++ * Set the FPGA's active-high clock line to the specified level
++ */
++int
++fpga_clk_fn (int assert_clk, int flush, int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: FPGA CLOCK %s", __FUNCTION__, __LINE__,
++ assert_clk?"high":"low");
++ GPIO_WRITE( CONFIG_SYS_FPGA_CLK, !assert_clk);
++ return assert_clk;
++}
++
++/*
++ * Test the state of the active-low FPGA INIT line. Return 1 on INIT
++ * asserted (low).
++ */
++int
++fpga_init_fn (int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ int value;
++ PRINTF ("%s:%d: INIT check... ", __FUNCTION__, __LINE__);
++ value = GPIO_READ(CONFIG_SYS_FPGA_INIT);
++ //printf("init value read %x",value);
++#ifdef CONFIG_SYS_FPGA_IS_PROTO
++ return value;
++#else
++ return !value;
++#endif
++}
++
++/*
++ * Test the state of the active-high FPGA DONE pin
++ */
++int
++fpga_done_fn (int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: DONE check... %s", __FUNCTION__, __LINE__,
++ GPIO_READ(CONFIG_SYS_FPGA_DONE)?"high":"low");
++ return(GPIO_READ(CONFIG_SYS_FPGA_DONE)?FPGA_SUCCESS:FPGA_FAIL);
++}
++
++/*
++ * Set the FPGA's wr line to the specified level
++ */
++int
++fpga_wr_fn (int assert_write, int flush, int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: FPGA RW... %s ", __FUNCTION__, __LINE__,
++ assert_write?"high":"low");
++ GPIO_WRITE( CONFIG_SYS_FPGA_RW, !assert_write);
++ return assert_write;
++}
++
++int
++fpga_cs_fn (int assert_cs, int flush, int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: FPGA CS %s ", __FUNCTION__, __LINE__,
++ assert_cs?"high":"low");
++ GPIO_WRITE( CONFIG_SYS_FPGA_CS, !assert_cs);
++ return assert_cs;
++}
++
++int
++fpga_rdata_fn ( unsigned char *data, int cookie )
++{
++ PRINTF ("%s:%d: FPGA READ DATA %02X ", __FUNCTION__, __LINE__,
++ *((char*)CONFIG_SYS_FPGA_RDATA));
++ *data = (unsigned char)((*((unsigned short*)CONFIG_SYS_FPGA_RDATA))&0x00FF);
++ return *data;
++}
++
++int
++fpga_wdata_fn ( unsigned char data, int cookie )
++{
++ PRINTF ("%s:%d: FPGA WRITE DATA %02X ", __FUNCTION__, __LINE__,
++ data);
++ *((unsigned short*)CONFIG_SYS_FPGA_WDATA) = data;
++ return data;
++}
++
++int
++fpga_abort_fn ( int cookie )
++{
++ return cookie;
++}
++
++
++int
++fpga_busy_fn ( int cookie )
++{
++ return 1;
++}
++
++int
++fpga_post_fn (int cookie)
++{
++ struct gpio_regs *gpregs = (struct gpio_regs *)IMX_GPIO_BASE;
++ PRINTF ("%s:%d: FPGA POST ", __FUNCTION__, __LINE__);
++
++ imx_gpio_mode (CONFIG_SYS_FPGA_RW | GPIO_PF | GPIO_PUEN);
++ imx_gpio_mode (CONFIG_SYS_FPGA_CS | GPIO_PF | GPIO_PUEN);
++ imx_gpio_mode (CONFIG_SYS_FPGA_CLK | GPIO_PF | GPIO_PUEN);
++ GPIO_SET(CONFIG_SYS_FPGA_PRG);
++ GPIO_CLEAR(CONFIG_SYS_FPGA_RESET);
++ imx_gpio_mode (CONFIG_SYS_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
++ return cookie;
++}
++
++/*
++ * Initialize the fpga. Return 1 on success, 0 on failure.
++ */
++int
++APF27_init_fpga (u_char * buffer, size_t size)
++{
++ char *autoload = getenv ("firmware_autoload");
++
++ int i,lout=0;
++
++ fpga_init();
++
++ for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
++ PRINTF ("%s:%d: Adding fpga %d\n", __FUNCTION__, __LINE__, i);
++ fpga_add (fpga_xilinx, &fpga[i]);
++ }
++
++ if ((size >= fpga[0].size) && ( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if (FPGA_SUCCESS != fpga_load( 0, (void *)buffer, size )) {
++ lout = 1;
++ printf("Firmware download failed!\n");
++ }
++ else
++ printf("Firmware successfully programmed\n");
++ }
++ return lout;
++}
++
++#endif /* CONFIG_FPGA */
+Index: u-boot-2010.03/board/armadeus/apf27/fpga.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2010.03/board/armadeus/apf27/fpga.h 2011-01-05 18:09:44.000000000 +0100
+@@ -0,0 +1,39 @@
++/*
++ * (C) Copyright 2002-2008
++ * Eric Jarrige <eri...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * 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
++ *
++ */
++extern int APF27_init_fpga (u_char * buffer, size_t size);
++
++extern int fpga_pre_fn (int cookie);
++extern int fpga_pgm_fn (int assert_pgm, int flush, int cookie);
++extern int fpga_cs_fn (int assert_cs, int flush, int cookie);
++extern int fpga_init_fn (int cookie);
++extern int fpga_done_fn (int cookie);
++extern int fpga_clk_fn (int assert_clk, int flush, int cookie);
++extern int fpga_wr_fn (int assert_write, int flush, int cookie);
++extern int fpga_rdata_fn ( unsigned char *data, int cookie );
++extern int fpga_wdata_fn ( unsigned char data, int cookie );
++extern int fpga_abort_fn (int cookie);
++extern int fpga_post_fn (int cookie);
++extern int fpga_busy_fn (int cookie);
diff --git a/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch b/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
deleted file mode 100644
index d9ed98d..0000000
--- a/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7d5eba120d72f2ea5e3a946fd2c87b021759f21b Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Tue, 4 Oct 2011 19:30:15 +0200
-Subject: [PATCH 3/6] Remove useless code in apf27
-
----
- board/armadeus/apf27/apf27.c | 45 ------------------------------------------
- 1 files changed, 0 insertions(+), 45 deletions(-)
-
-diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
-index e08b7a2..d4f2082 100644
---- a/board/armadeus/apf27/apf27.c
-+++ b/board/armadeus/apf27/apf27.c
-@@ -27,31 +27,6 @@
-
- DECLARE_GLOBAL_DATA_PTR;
-
--static int read_firmware (size_t offset, size_t end, u_char * buf)
--{
-- size_t amount_loaded = 0;
-- size_t blocksize;
--
-- u_char *char_ptr;
--
-- blocksize = nand_info[0].erasesize;
--
-- while (offset < end) {
-- if (nand_block_isbad(&nand_info[0], offset)) {
-- offset += blocksize;
-- } else {
-- char_ptr = &buf[amount_loaded];
-- if (nand_read(&nand_info[0], offset, &blocksize, char_ptr))
-- return 1;
-- offset += blocksize;
-- amount_loaded += blocksize;
-- }
-- }
--
-- return amount_loaded;
--}
--
--
- static int apf27_devices_init(void)
- {
- int i;
-@@ -141,27 +116,7 @@ int
- misc_init_r (void)
- {
- char *s;
-- u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
-- size_t end = 0;
-- size_t size = 0;
- size_t offset = -1;
-- char *autoload = getenv ("firmware_autoload");
--
--#if defined(CONFIG_FPGA)
-- /* init and download fpga */
-- if (( autoload ) && (0 == strcmp(autoload, "1"))) {
-- if ((s = getenv("firmware_offset")) != NULL) {
-- offset = simple_strtoul(s, NULL, 16);
-- }
-- if ((s = getenv("firmware_len")) != NULL) {
-- end = offset + simple_strtoul(s, NULL, 16);
-- }
-- if ((-1 != offset) && (offset != end)) {
-- size = read_firmware (offset, end, firmware_buffer);
-- }
-- }
-- APF27_init_fpga (firmware_buffer, size);
--#endif
-
- /* detect compatibility issue of environment version */
- s = getenv ("env_version");
---
-1.7.4.4
-
diff --git a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
deleted file mode 100644
index 2ba4946..0000000
--- a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 8aa4ee39d003d442cc9f01ea487dcce190274cfc Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Wed, 25 Jan 2012 20:36:42 +0100
-Subject: [PATCH 6/6] Debug nand, this patch should be removed
-
----
- drivers/mtd/nand/mxc_nand.c | 22 +++++++++++++++++++++-
- drivers/mtd/nand/nand_base.c | 2 ++
- 2 files changed, 31 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
-index 35e89a0..929e228 100644
---- a/drivers/mtd/nand/mxc_nand.c
-+++ b/drivers/mtd/nand/mxc_nand.c
-@@ -193,7 +193,8 @@ static struct mxc_nand_host mxc_host;
- static struct mxc_nand_host *host = &mxc_host;
-
- /* Define delays in microsec for NAND device operations */
--#define TROP_US_DELAY 2000
-+#define TROP_US_DELAY 10000
-+
- /* Macros to get byte and bit positions of ECC */
- #define COLPOS(x) ((x) >> 3)
- #define BITPOS(x) ((x) & 0xf)
-@@ -326,6 +327,21 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd)
- {
- MTDDEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x)\n", cmd);
-
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: bufsize = 0x%04x\n", __func__, readw(&host->regs->nfc_buf_size));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_buf_addr = 0x%04x\n", __func__, readw(&host->regs->nfc_buf_addr));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_flash_addr = 0x%04x\n", __func__, readw(&host->regs->nfc_flash_addr));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_flash_cmd = 0x%04x\n", __func__, readw(&host->regs->nfc_flash_cmd));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_config = 0x%04x\n", __func__, readw(&host->regs->nfc_config));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_ecc_status_result = 0x%04x\n", __func__, readw(&host->regs->nfc_ecc_status_result));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_rsltmain_area = 0x%04x\n", __func__, readw(&host->regs->nfc_rsltmain_area));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_rsltspare_area = 0x%04x\n", __func__, readw(&host->regs->nfc_rsltspare_area));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_wrprot = 0x%04x\n", __func__, readw(&host->regs->nfc_wrprot));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_unlockstart_blkaddr = 0x%04x\n", __func__, readw(&host->regs->nfc_unlockstart_blkaddr));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_unlockend_blkaddr = 0x%04x\n", __func__, readw(&host->regs->nfc_unlockend_blkaddr));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_nf_wrprst = 0x%04x\n", __func__, readw(&host->regs->nfc_nf_wrprst));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: config1 = 0x%04x\n", __func__, readw(&host->regs->nfc_config1));
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: config2 = 0x%04x\n", __func__, readw(&host->regs->nfc_config2));
-+
- writew(cmd, &host->regs->nfc_flash_cmd);
- writew(NFC_CMD, &host->regs->nfc_config2);
-
-@@ -1308,6 +1324,8 @@ int board_nand_init(struct nand_chip *this)
- uint16_t tmp;
- int err = 0;
-
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s(this = %p)\n", __func__, this);
-+
- /* structures must be linked */
- mtd = &host->mtd;
- mtd->priv = this;
-@@ -1391,6 +1409,8 @@ int board_nand_init(struct nand_chip *this)
- if (is_16bit_nand())
- this->options |= NAND_BUSWIDTH_16;
-
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: this->options = %x\n", __func__, this->options);
-+
- #ifdef CONFIG_SYS_NAND_LARGEPAGE
- host->pagesize_2k = 1;
- this->ecc.layout = &nand_hw_eccoob2k;
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index 27f6c77..6107b8b 100644
---- a/drivers/mtd/nand/nand_base.c
-+++ b/drivers/mtd/nand/nand_base.c
-@@ -2578,6 +2578,8 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
- tmp_manf = chip->read_byte(mtd);
- tmp_id = chip->read_byte(mtd);
-
-+ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: manf = %02x, id = %02x\n", __func__, tmp_manf, tmp_id);
-+
- if (tmp_manf != *maf_id || tmp_id != *dev_id) {
- printk(KERN_INFO "%s: second ID read did not match "
- "%02x,%02x against %02x,%02x\n", __func__,
-1.7.4.4
-
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-17 11:09:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bcaff153460985f4a2c1eb6b40ef60658326d2e2 (commit)
from 5242483cc6196b5bffed4f3a4f419c803d36548a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bcaff153460985f4a2c1eb6b40ef60658326d2e2
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 17 12:09:23 2012 +0100
[BUILDROOT] target_skeleton: update /etc/mdev.conf to state of the art
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/rootfs/target_skeleton/etc/mdev.conf | 61 +++++++++-----------
1 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mdev.conf b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mdev.conf
index d63d78a..51bf588 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mdev.conf
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/mdev.conf
@@ -1,5 +1,9 @@
# mdev.conf for Armadeus boards
#
+# Provide user, group, and mode information for devices. If a regex matches
+# the device name provided by sysfs, use the appropriate user:group and mode
+# instead of the default 0:0 660.
+#
# Syntax:
# <regexp> <UID>:<GID> <PERM> [{@,$,*} <CMD>]
# @: run <CMD> after creating
@@ -7,43 +11,34 @@
# *: like @ and $ at the same time
# <CMD> is run inside /dev using system()
-full 0:0 666
-null 0:0 777
-zero 0:0 666
+full 0:0 666
+null 0:0 777
+zero 0:0 666
+random 0:0 444
+urandom 0:0 444
+
+kmem 0:9 000
+mem 0:9 640
-random 0:0 444
-urandom 0:0 444
+console 0:5 600
+ptmx 0:5 660
+tty[0-9].* 0:5 660
-console 0:5 0600
-kmem 0:9 000
-mem 0:9 0640
-ptmx 0:5 0660
+ttyS[0-9].* 0:20 640
-sda.* 0:6 0660
-sdb.* 0:6 0660
-hda.* 0:6 0660
-hdb.* 0:6 0660
-mtd.* 0:6 0660
-mmc.* 0:6 0660
+# Block devices
+sd[a-z].* 0:6 0660
+mmcblk[0-9].* 0:6 0660
+hd[a-z].* 0:6 0660
+mtd.* 0:6 0660
# Move input devices to input directory
-event.* 0:0 0660 @(mkdir -p input&&mv $MDEV input)
-mice 0:0 0660 @(mkdir -p input&&mv $MDEV input)
-mouse.* 0:0 0660 @(mkdir -p input&&mv $MDEV input)
+event.* 0:0 0660 @(mkdir -p input&&mv $MDEV input)
+mice 0:0 0660 @(mkdir -p input&&mv $MDEV input)
+mouse.* 0:0 0660 @(mkdir -p input&&mv $MDEV input)
# Move sound devices to sound directory
-pcm.* 0:101 0660 @(mkdir -p snd&&mv $MDEV snd)
-seq 0:101 0660 @(mkdir -p snd&&mv $MDEV snd)
-timer 0:101 0660 @(mkdir -p snd&&mv $MDEV snd)
-control.* 0:101 0660 @(mkdir -p snd&&mv $MDEV snd)
-
-tty 0:5 0660
-tty0.* 0:5 0660
-tty1.* 0:5 0660
-tty2.* 0:5 0660
-tty3.* 0:5 0660
-tty4.* 0:5 0660
-tty5.* 0:5 0660
-tty6.* 0:5 0660
-
-ttyS.* 0:20 640
+pcm.* 0:100 0660 @(mkdir -p snd&&mv $MDEV snd)
+seq 0:100 0660 @(mkdir -p snd&&mv $MDEV snd)
+timer 0:100 0660 @(mkdir -p snd&&mv $MDEV snd)
+control.* 0:100 0660 @(mkdir -p snd&&mv $MDEV snd)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-16 21:35:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5242483cc6196b5bffed4f3a4f419c803d36548a (commit)
via 2fea885a25b130458d6668220ca64257623d566b (commit)
via 3b3dab06d9b73eb25adfc6b5a7a56e51639677cc (commit)
via 27858bd0f4c19cf8d1d72e31d73fe743825c354d (commit)
via 3ff74ca52dca19fe36ed51d29514457022bb6e2e (commit)
from 65df65b6125757685f8140754b6786d6700b23ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5242483cc6196b5bffed4f3a4f419c803d36548a
Merge: 2fea885 65df65b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:34:53 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2fea885a25b130458d6668220ca64257623d566b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:34:20 2012 +0100
[LINUX] 2.6.35 / APF28Dev : add mmc/sd support
commit 3b3dab06d9b73eb25adfc6b5a7a56e51639677cc
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:10:29 2012 +0100
[TOOLS] Add LRADC registers to imx28regs
commit 27858bd0f4c19cf8d1d72e31d73fe743825c354d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:08:41 2012 +0100
[TOOLS] scripts/export_linux_config.sh can't be used on 2.6.35
commit 3ff74ca52dca19fe36ed51d29514457022bb6e2e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 16 22:07:17 2012 +0100
[BUILDROOT] Add group n°20 name (dialout) in target_skeleton /etc/group
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-2.6.35.config | 4 +-
.../armadeus/rootfs/target_skeleton/etc/group | 1 +
...1-armadeus-add_apf28dev_baseboard_support.patch | 155 ++++++++++++++++++--
scripts/export_linux_config.sh | 2 +-
target/linux/debug/imxregs/imx28regs.h | 25 +++
5 files changed, 172 insertions(+), 15 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 4974b27..e1d78c1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.3
-# Fri Feb 3 12:55:29 2012
+# Tue Feb 14 19:36:30 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1602,7 +1602,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_SDHCI is not set
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_IMX_ESDHCI_PIO_MODE is not set
-# CONFIG_MMC_MXS is not set
+CONFIG_MMC_MXS=y
# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
index f78c22c..e27cba7 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/group
@@ -6,6 +6,7 @@ adm:x:4:
tty:x:5:
disk:x:6:
wheel:x:10:root
+dialout:x:20:
utmp:x:43:
staff:x:50:
haldaemon:x:68:
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 53eb53d..331017e 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig 2012-02-06 12:10:27.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Kconfig 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/Kconfig 2012-02-15 14:43:35.000000000 +0100
@@ -16,6 +16,22 @@
endchoice
@@ -31,8 +31,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Kconfig
default 0
Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
===================================================================
---- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile 2012-02-06 12:10:27.000000000 +0100
-+++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/Makefile 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/Makefile 2012-02-15 14:43:35.000000000 +0100
@@ -6,6 +6,7 @@
# Board select
obj-$(CONFIG_MACH_MX28EVK) += mx28evk.o mx28evk_pins.o
@@ -44,8 +44,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/Makefile
Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-06 12:56:06.000000000 +0100
-@@ -0,0 +1,242 @@
++++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-15 15:51:09.000000000 +0100
+@@ -0,0 +1,313 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -270,6 +270,77 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ },
+*/
+#endif
++ /* SSP0 SD/MMC port pins */
++ {
++ .name = "SSP0_DATA0",
++ .id = PINID_SSP0_DATA0,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA1",
++ .id = PINID_SSP0_DATA1,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA2",
++ .id = PINID_SSP0_DATA2,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_DATA3",
++ .id = PINID_SSP0_DATA3,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_CMD",
++ .id = PINID_SSP0_CMD,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 1,
++ .drive = 1,
++ .pull = 1,
++ },
++ {
++ .name = "SSP0_SCK",
++ .id = PINID_SSP0_SCK,
++ .fun = PIN_FUN1,
++ .strength = PAD_12MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = 2,
++ .pull = 0,
++ },
++ {
++ .name = "SSP0_DETECT",
++ .id = PINID_SSP0_DETECT,
++ .fun = PIN_FUN1,
++ .strength = PAD_8MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = 1,
++ .pull = 0,
++ },
+};
+
+static void __init apf28dev_device_init(void)
@@ -290,8 +361,8 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+
Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig 2012-02-06 12:10:08.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Kconfig 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/drivers/video/mxs/Kconfig 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/Kconfig 2012-02-15 14:43:35.000000000 +0100
@@ -21,6 +21,20 @@
---help---
Use LMS430 dotclock LCD panel for MXS
@@ -315,8 +386,8 @@ Index: linux-2.6.35.3/drivers/video/mxs/Kconfig
bool "TVENC"
Index: linux-2.6.35.3/drivers/video/mxs/Makefile
===================================================================
---- linux-2.6.35.3.orig/drivers/video/mxs/Makefile 2012-02-06 12:10:08.000000000 +0100
-+++ linux-2.6.35.3/drivers/video/mxs/Makefile 2012-02-06 12:10:27.000000000 +0100
+--- linux-2.6.35.3.orig/drivers/video/mxs/Makefile 2012-02-15 14:42:20.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/Makefile 2012-02-15 14:43:35.000000000 +0100
@@ -2,5 +2,7 @@
obj-$(CONFIG_FB_MXS) += mxsfb.o
obj-$(CONFIG_FB_MXS_LCD_43WVF1G) += lcd_43wvf1g.o
@@ -328,7 +399,7 @@ Index: linux-2.6.35.3/drivers/video/mxs/Makefile
Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c 2012-02-06 12:10:27.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c 2012-02-15 14:43:35.000000000 +0100
@@ -0,0 +1,305 @@
+/*
+ * Tianma TM035 LCD panel initialization for Armadeus APF28Dev
@@ -638,7 +709,7 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c 2012-02-06 12:10:27.000000000 +0100
++++ linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c 2012-02-15 14:43:35.000000000 +0100
@@ -0,0 +1,297 @@
+/*
+ * Freescale MX28 Densitron LW700 LCD panel driver
@@ -937,3 +1008,63 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+}
+
+subsys_initcall(register_devices);
+Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
+===================================================================
+--- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c 2012-02-15 14:43:59.000000000 +0100
++++ linux-2.6.35.3/arch/arm/mach-mx28/device.c 2012-02-15 14:52:10.000000000 +0100
+@@ -426,7 +426,6 @@
+ #define MMC1_POWER MXS_PIN_TO_GPIO(PINID_PWM4)
+ #define MMC0_WP MXS_PIN_TO_GPIO(PINID_SSP1_SCK)
+ #define MMC1_WP MXS_PIN_TO_GPIO(PINID_GPMI_RESETN)
+-#endif
+
+ static int mxs_mmc_get_wp_ssp0(void)
+ {
+@@ -467,6 +466,7 @@
+ gpio_free(MMC0_WP);
+
+ }
++#endif
+
+ static void mxs_mmc_cmd_pullup_ssp0(int enable)
+ {
+@@ -490,6 +490,7 @@
+ return hz;
+ }
+
++#if defined(CONFIG_MACH_MX28EVK)
+ static int mxs_mmc_get_wp_ssp1(void)
+ {
+ return gpio_get_value(MMC1_WP);
+@@ -528,6 +529,7 @@
+ gpio_free(MMC1_POWER);
+ gpio_free(MMC1_WP);
+ }
++#endif /* CONFIG_MACH_MX28EVK */
+
+ static void mxs_mmc_cmd_pullup_ssp1(int enable)
+ {
+@@ -552,9 +554,11 @@
+ }
+
+ static struct mxs_mmc_platform_data mmc0_data = {
++#if defined(CONFIG_MACH_MX28EVK)
+ .hw_init = mxs_mmc_hw_init_ssp0,
+ .hw_release = mxs_mmc_hw_release_ssp0,
+ .get_wp = mxs_mmc_get_wp_ssp0,
++#endif
+ .cmd_pullup = mxs_mmc_cmd_pullup_ssp0,
+ .setclock = mxs_mmc_setclock_ssp0,
+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
+@@ -591,9 +595,11 @@
+ };
+
+ static struct mxs_mmc_platform_data mmc1_data = {
++#if defined(CONFIG_MACH_MX28EVK)
+ .hw_init = mxs_mmc_hw_init_ssp1,
+ .hw_release = mxs_mmc_hw_release_ssp1,
+ .get_wp = mxs_mmc_get_wp_ssp1,
++#endif
+ .cmd_pullup = mxs_mmc_cmd_pullup_ssp1,
+ .setclock = mxs_mmc_setclock_ssp1,
+ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
diff --git a/scripts/export_linux_config.sh b/scripts/export_linux_config.sh
index 2253751..20fd347 100755
--- a/scripts/export_linux_config.sh
+++ b/scripts/export_linux_config.sh
@@ -4,7 +4,7 @@ pwd
make shell_env
source ./armadeus_env.sh
-if [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.29" ]; then
+if [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.29" ] || [ "$ARMADEUS_LINUX_MAIN_VERSION" == "2.6.35" ]; then
echo "Not supported for this kernel version ($ARMADEUS_LINUX_MAIN_VERSION)"
exit 1
fi
diff --git a/target/linux/debug/imxregs/imx28regs.h b/target/linux/debug/imxregs/imx28regs.h
index 2935bb4..c19d843 100644
--- a/target/linux/debug/imxregs/imx28regs.h
+++ b/target/linux/debug/imxregs/imx28regs.h
@@ -90,4 +90,29 @@ static struct reg_info regs[] =
{ "HW_LCDIF_DEBUG0", 0x800301d0, 0, 0xffffffff, 'x', "LCD Interface Debug0 Register" },
{ "HW_LCDIF_DEBUG1", 0x800301e0, 0, 0xffffffff, 'x', "LCD Interface Debug1 Register" },
{ "HW_LCDIF_DEBUG2", 0x800301f0, 0, 0xffffffff, 'x', "LCD Interface Debug2 Register" },
+/* LRADC */
+{ "HW_LRADC_CTRL0", 0x80050000, 0, 0xffffffff, 'x', "LRADC Control Register 0" },
+{ "HW_LRADC_CTRL1", 0x80050010, 0, 0xffffffff, 'x', "LRADC Control Register 1" },
+{ "HW_LRADC_CTRL2", 0x80050020, 0, 0xffffffff, 'x', "LRADC Control Register 2" },
+{ "HW_LRADC_CTRL3", 0x80050030, 0, 0xffffffff, 'x', "LRADC Control Register 3" },
+{ "HW_LRADC_STATUS", 0x80050040, 0, 0xffffffff, 'x', "LRADC Status Register" },
+{ "HW_LRADC_CH0", 0x80050050, 0, 0xffffffff, 'x', "LRADC 0 Result Register" },
+{ "HW_LRADC_CH1", 0x80050060, 0, 0xffffffff, 'x', "LRADC 1 Result Register" },
+{ "HW_LRADC_CH2", 0x80050070, 0, 0xffffffff, 'x', "LRADC 2 Result Register" },
+{ "HW_LRADC_CH3", 0x80050080, 0, 0xffffffff, 'x', "LRADC 3 Result Register" },
+{ "HW_LRADC_CH4", 0x80050090, 0, 0xffffffff, 'x', "LRADC 4 Result Register" },
+{ "HW_LRADC_CH5", 0x800500a0, 0, 0xffffffff, 'x', "LRADC 5 Result Register" },
+{ "HW_LRADC_CH6", 0x800500b0, 0, 0xffffffff, 'x', "LRADC 6 Result Register" },
+{ "HW_LRADC_CH7", 0x800500c0, 0, 0xffffffff, 'x', "LRADC 7 (BATT) Result Register" },
+{ "HW_LRADC_DELAY0", 0x800500d0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 0" },
+{ "HW_LRADC_DELAY1", 0x800500e0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 1" },
+{ "HW_LRADC_DELAY2", 0x800500f0, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 2" },
+{ "HW_LRADC_DELAY3", 0x80050100, 0, 0xffffffff, 'x', "LRADC Scheduling Delay 3" },
+{ "HW_LRADC_DEBUG0", 0x80050110, 0, 0xffffffff, 'x', "LRADC Debug Register 0" },
+{ "HW_LRADC_DEBUG1", 0x80050120, 0, 0xffffffff, 'x', "LRADC Debug Register 1" },
+{ "HW_LRADC_CONVERSION", 0x80050130, 0, 0xffffffff, 'x', "LRADC Battery Conversion Register" },
+{ "HW_LRADC_CTRL4", 0x80050140, 0, 0xffffffff, 'x', "LRADC Control Register 4" },
+{ "HW_LRADC_THRESHOLD0", 0x80050150, 0, 0xffffffff, 'x', "LRADC Theshold0 Register" },
+{ "HW_LRADC_THRESHOLD1", 0x80050160, 0, 0xffffffff, 'x', "LRADC Theshold1 Register" },
+{ "HW_LRADC_VERSION", 0x80050170, 0, 0xffffffff, 'x', "LRADC Version Register" },
};
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-14 22:05:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 65df65b6125757685f8140754b6786d6700b23ff (commit)
from 5af1ec9198e4490702239acd340fe1f9c80220f3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65df65b6125757685f8140754b6786d6700b23ff
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 23:05:21 2012 +0100
[UBOOT] apf28: update U-Boot recover image file
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf28-u-boot-spl | Bin 193422 -> 193422 bytes
software/uboot_recover/apf28-u-boot.sb | Bin 410112 -> 409152 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/software/uboot_recover/apf28-u-boot-spl b/software/uboot_recover/apf28-u-boot-spl
index 22f34e5..0936403 100755
Binary files a/software/uboot_recover/apf28-u-boot-spl and b/software/uboot_recover/apf28-u-boot-spl differ
diff --git a/software/uboot_recover/apf28-u-boot.sb b/software/uboot_recover/apf28-u-boot.sb
index 4fefc54..762491b 100644
Binary files a/software/uboot_recover/apf28-u-boot.sb and b/software/uboot_recover/apf28-u-boot.sb differ
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-14 21:54:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5af1ec9198e4490702239acd340fe1f9c80220f3 (commit)
via 1ae190de599e01607904a2b54e0e124672c49c28 (commit)
from 49954ee73a93547fbdf0dbeb4f946fc4de0f0810 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5af1ec9198e4490702239acd340fe1f9c80220f3
Merge: 1ae190d 49954ee
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 22:54:21 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1ae190de599e01607904a2b54e0e124672c49c28
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 22:53:21 2012 +0100
[UBOOT] apf28: conde and config cleanup
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 75 +++++---------------
patches/u-boot/2011.12/502-add-apf28.patch | 32 +++++++--
2 files changed, 46 insertions(+), 61 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 2ea3539..a356c5d 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -26,8 +26,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.3"
-#define CONFIG_IDENT_STRING " apf28 patch 0.5"
+#define CONFIG_ENV_VERSION "0.4"
+#define CONFIG_IDENT_STRING " apf28 patch 0.6"
/*
* SoC configurations
@@ -43,6 +43,7 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_ARCH_MISC_INIT
@@ -51,8 +52,8 @@
*/
#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
+#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
@@ -65,12 +66,7 @@
#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
-/*
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-*/
-
-#define CONFIG_BOARD_NAME "apf28"
+#define CONFIG_BOARD_NAME apf28
#define CONFIG_HOSTNAME "apf28"
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
@@ -132,8 +128,10 @@
/*
* FLASH organization
*/
-#define CONFIG_SYS_MONITOR_OFFSET 0x00000000 /* offset in NAND */
-#define CONFIG_SYS_MONITOR_LEN 0x00300000 /* 3MB */
+/* First 1 MiB reservered for mx28 NAND BCBÂ tables */
+/* last 2 MiB reservered for 2 copies of U-Boot */
+#define CONFIG_SYS_MONITOR_OFFSET 0x00100000 /* offset in NAND */
+#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 2 x 1MB */
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
@@ -287,7 +285,7 @@
#define CONFIG_INITRD_TAG
#define CONFIG_BOOTDELAY -1
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
@@ -333,47 +331,12 @@
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
"nboot.jffs2 40800000 0 ${kernel_offset}\0" \
- "update_nand_full_filename=apf28-u-boot.bin\0" \
- "update_nand_firmware_filename=apf28-u-boot.sb\0" \
- "update_nand_firmware_maxsz=0x100000\0" \
- "update_nand_stride=0x40\0" /* MX28 datasheet ch. 12.12 */ \
- "update_nand_count=0x4\0" /* MX28 datasheet ch. 12.12 */ \
- "update_nand_get_fcb_size=" /* Get size of FCB blocks */ \
- "nand device 0 ; " \
- "nand info ; " \
- "setexpr fcb_sz ${update_nand_stride} * ${update_nand_count};" \
- "setexpr update_nand_fcb ${fcb_sz} * ${nand_writesize}\0" \
- "update_nand_full=" /* Update FCB, DBBT and FW */ \
- "if tftp ${update_nand_full_filename} ; then " \
- "run update_nand_get_fcb_size ; " \
- "nand scrub -y 0x0 ${filesize} ; " \
- "nand write.raw ${loadaddr} 0x0 ${update_nand_fcb} ; " \
- "setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
- "setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
- "if nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
- "then echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi;" \
- "fi; \0" \
- "update_nand_firmware=" /* Update only firmware */ \
- "if tftp ${update_nand_firmware_filename} ; then " \
- "run update_nand_get_fcb_size ; " \
- "setexpr fcb_sz ${update_nand_fcb} * 2 ; " /* FCB + DBBT */ \
- "setexpr fw_sz ${update_nand_firmware_maxsz} * 2 ; " \
- "setexpr fw_off ${fcb_sz} + ${update_nand_firmware_maxsz};" \
- "nand erase ${fcb_sz} ${fw_sz} ; " \
- "nand write ${loadaddr} ${fcb_sz} ${filesize} ; " \
- "nand write ${loadaddr} ${fw_off} ${filesize} ; " \
- "fi\0" \
- "flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
- "run update_nand_get_fcb_size ; " \
- "setexpr fcb_sz ${update_nand_fcb} * 2 ; " /* FCB + DBBT */ \
- "setexpr fw_sz ${update_nand_firmware_maxsz} * 2 ; " \
- "setexpr fw_off ${fcb_sz} + ${update_nand_firmware_maxsz};" \
- "if bcb write.nand ; then " \
- "nand erase ${fcb_sz} ${fw_sz} ; " \
- "nand write ${fileaddr} ${fw_off} ${filesize};" \
- "if nand write ${fileaddr} ${fcb_sz} ${filesize};" \
+ "flash_uboot=nand unlock;" \
+ "if bcb nand.write ; then " \
+ "nand erase ${uboot_offset} ${uboot_len} ; " \
+ "nand write ${fileaddr} ${uboot_offset} ${filesize};" \
+ "nand erase ${uboot2_offset} ${uboot_len};" \
+ "if nand write ${fileaddr} ${uboot2_offset} ${filesize};" \
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
@@ -384,7 +347,7 @@
"then echo Flashing of kernel succeed;" \
"else echo Flashing of kernel failed;" \
"fi\0" \
- "flash_rootfs=nand erase.part rootfs;" \
+ "flash_rootfs=nand erase.part rootfs;" \
"if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
@@ -394,7 +357,7 @@
"download_uboot=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-u-boot.sb\0" \
"download_kernel=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-linux.bin\0" \
+ " ${serverpath}${bootfile}\0" \
"download_rootfs=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-rootfs.ubi\0" \
"update_uboot=run download_uboot flash_uboot\0" \
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 86a50dd..a8ac987 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1,6 +1,6 @@
--- u-boot-2011.12/board/armadeus/apf28/apf28.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/apf28.c 2012-01-29 09:57:15.183543034 +0100
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,236 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
@@ -176,6 +176,22 @@
+ return ret;
+}
+
++#ifdef CONFIG_BOARD_LATE_INIT
++int board_late_init(void)
++{
++ char *s;
++
++ /* detect compatibility issue of environment version */
++ s = getenv("env_version");
++ if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++ printf("*** Warning - Environment version change suggests: "
++ "run flash_reset_env; reset\n");
++ }
++
++ return 0;
++}
++#endif
++
+#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP
+
+#define MXS_OCOTP_MAX_TIMEOUT 1000000
@@ -553,8 +569,8 @@
+
+#########################################################################
--- u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-08 23:00:37.501763289 +0100
-@@ -0,0 +1,548 @@
++++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-14 11:55:34.376435178 +0100
+@@ -0,0 +1,554 @@
+/*
+ * i.MX28 NAND Boot Control Blocks generator
+ *
@@ -1025,6 +1041,7 @@
+ nand_info_t *nand = &nand_info[0];
+ struct mx28_ocotp_regs *ocotp_regs =
+ (struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
++ char buf [12];
+
+ stride_pages = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 4) & 0x0f) * 64;
+ if (stride_pages < 64) stride_pages = 64;
@@ -1064,6 +1081,11 @@
+ goto err2;
+ }
+
++ sprintf(buf, "0x%08x", fcb->firmware1_starting_sector * nand->writesize);
++ setenv("uboot_offset", buf);
++ sprintf(buf, "0x%08x", fcb->firmware2_starting_sector * nand->writesize);
++ setenv("uboot2_offset", buf);
++
+ printf("NAND BCB tables updated\n");
+ ret = 0;
+
@@ -1083,7 +1105,7 @@
+ if (argc < 2 || argc > 3)
+ goto usage;
+
-+ if (strcmp(argv[1], "write.nand") == 0) {
++ if (strcmp(argv[1], "nand.write") == 0) {
+ if (argc == 3) {
+ arg = simple_strtoul(argv[2], NULL, 16);
+ }
@@ -1100,7 +1122,7 @@
+U_BOOT_CMD(
+ bcb, 2, 1, do_bcb,
+ "mx28 Boot Control Block sub system",
-+ "write.nand [Firmware max size] - Update NAND BCB tables\n"
++ "nand.write [Firmware max size] - Update NAND BCB tables\n"
+ " default firmware max size is 1MiB");
+
--- u-boot-2011.12/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-14 02:09:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 49954ee73a93547fbdf0dbeb4f946fc4de0f0810 (commit)
from efd51354fe80fd9c959be7f5a4041056bfd2103f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 49954ee73a93547fbdf0dbeb4f946fc4de0f0810
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 02:35:45 2012 +0100
[UBOOT] apf27: update config file to support bad block in boot partition
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2010.03.h | 4 ++--
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
index 805bf20..c5a9e1d 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
@@ -32,7 +32,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "2.0"
-#define CONFIG_IDENT_STRING " apf27 patch 2.6"
+#define CONFIG_IDENT_STRING " apf27 patch 2.7"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_MX27 1 /* in a Freescale i.MX27 Chip */
@@ -138,7 +138,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "filesize=" MK_STR(0x00080000) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,4\0" \
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 03dc92b..33f83e8 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -32,7 +32,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "2.0"
-#define CONFIG_IDENT_STRING " apf27 patch 2.6"
+#define CONFIG_IDENT_STRING " apf27 patch 2.7"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_MX27 1 /* in a Freescale i.MX27 Chip */
@@ -139,7 +139,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CONFIG_SYS_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
+ "filesize=" MK_STR(0x00080000) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,4\0" \
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-14 01:32:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via efd51354fe80fd9c959be7f5a4041056bfd2103f (commit)
via 1fe11f74ee3c723c22593676a375fc9ee85d0528 (commit)
via 1f90a94f2db37a353dc24ee6b8e384a71040dc8f (commit)
from 0a672e05b0f816e724f681e32a1869a9d2b442f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit efd51354fe80fd9c959be7f5a4041056bfd2103f
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 02:31:31 2012 +0100
[UBOOT] apf27: use U-Boot 1.3.4 patched 2.3 as U-Boot recover
commit 1fe11f74ee3c723c22593676a375fc9ee85d0528
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 02:28:44 2012 +0100
[UBOOT] apf27: init clock at startup in any cases
commit 1f90a94f2db37a353dc24ee6b8e384a71040dc8f
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 02:27:33 2012 +0100
[UBOOT] apf27: keep one spare block for bad block while recovering UBoot
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-1.3.4.h | 4 ++--
patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch | 6 ++----
software/uboot_recover/apf27-u-boot.bin | Bin 220212 -> 226016 bytes
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
index e684a95..bfe6115 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
@@ -33,7 +33,7 @@
#define __CONFIG_H
#define CONFIG_ENV_VERSION "2.0"
-#define CONFIG_IDENT_STRING " apf27 patch 2.2"
+#define CONFIG_IDENT_STRING " apf27 patch 2.3"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
#define CONFIG_IMX27 1 /* in a Freescale i.MX27 Chip */
@@ -127,7 +127,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
"fileaddr=" MK_STR(CFG_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CFG_MONITOR_LEN) "\0" \
+ "filesize=" MK_STR(0x00080000) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,4\0" \
diff --git a/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
index 61bedd3..e310176 100644
--- a/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
+++ b/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
@@ -513,7 +513,7 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S 2011-01-05 14:50:39.000000000 +0100
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,341 @@
+/*
+ * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
+ * Applications Processor Reference Manual, Rev. 0.2".
@@ -841,7 +841,7 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
+ writel(DSCR7, CFG_DSCR7_VAL)
+ writel(DSCR2, CFG_DSCR2_VAL)
+
-+
++ init_clock
+
+ /* skip clock and sdram initialization if we run from ram */
+ cmp pc, #0xa0000000
@@ -851,8 +851,6 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
+
+ mov pc,r10
+1:
-+ init_clock
-+
+ sdram_init
+
+ mov pc,r10
diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
index 50c9b1c..74d6891 100644
Binary files a/software/uboot_recover/apf27-u-boot.bin and b/software/uboot_recover/apf27-u-boot.bin differ
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-13 23:37:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0a672e05b0f816e724f681e32a1869a9d2b442f9 (commit)
from 2889b522aae55c6794e0a4fb3f26c42e394f203a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0a672e05b0f816e724f681e32a1869a9d2b442f9
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 14 00:36:36 2012 +0100
[UBOOT] apf27: make UBoot self relocatable and bootable from NAND flash
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2011.12.h | 2 +-
...-Add-support-for-the-armadeus-apf27-board.patch | 38 +++++++++++++++----
...elocation.patch => 330-arm926-relocation.patch} | 15 ++++----
3 files changed, 39 insertions(+), 16 deletions(-)
copy patches/u-boot/2011.12/{425-cortex-relocation.patch => 330-arm926-relocation.patch} (59%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 2c5e2a2..03dc92b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -518,7 +518,7 @@
/* making u-boot runnable from flash and also RAM that is usefull to boot */
/* from serial port and from flash with only one version of U-Boot */
#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0xA0000000
+#define CONFIG_SYS_TEXT_BASE 0xA1000000
#endif
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
diff --git a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
index 6f4b9e9..45dd049 100644
--- a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -304,7 +304,7 @@ new file mode 100644
index 0000000..4d72d8c
--- /dev/null
+++ b/board/armadeus/apf27/lowlevel_init.S
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,365 @@
+/*
+ * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
+ * Applications Processor Reference Manual, Rev. 0.2".
@@ -590,8 +590,6 @@ index 0000000..4d72d8c
+.globl lowlevel_init
+lowlevel_init:
+
-+ mov r10, lr
-+
+ init_aipi
+
+ /* configure csx */
@@ -632,7 +630,7 @@ index 0000000..4d72d8c
+ writel(DSCR7, CONFIG_SYS_DSCR7_VAL)
+ writel(DSCR2, CONFIG_SYS_DSCR2_VAL)
+
-+
++ init_clock
+
+ /* skip clock and sdram initialization if we run from ram */
+ cmp pc, #0xa0000000
@@ -640,13 +638,37 @@ index 0000000..4d72d8c
+ cmp pc, #0xc0000000
+ bhi 1f
+
-+ mov pc,r10
++ b copy2ram
+1:
-+ init_clock
-+
+ sdram_init
+
-+ mov pc,r10
++/* make U-Boot runnable form "almost" anywhere */
++/* but SYS_TEXT_BASE should be in RAM */
++copy2ram: /* populate _TEXT_BASE with U-Boot from load addr */
++ ldr r0, _start_adr
++ ldr r1, _copy2ram
++ sub r1, r1, r0
++ adr r0, copy2ram
++ sub r0, r0, r1
++ ldr r1, =CONFIG_SYS_TEXT_BASE
++ cmp r0, r1
++ beq end_of_copy2ram /* skip U-Boot copy */
++ ldr r2, =CONFIG_SYS_MONITOR_LEN
++ add r2, r2, r0 /* r2 <- source end address */
++
++copy_loop:
++ ldmia r0!, {r9-r10} /* copy from source address [r0] */
++ stmia r1!, {r9-r10} /* copy to target address [r1] */
++ cmp r0, r2 /* until source end address [r2] */
++ blo copy_loop
++
++end_of_copy2ram:
++ mov pc,lr
++
++_copy2ram:
++ .word copy2ram
++_start_adr:
++ .word _start /* r12 saved upper lr*/
+
diff --git a/board/armadeus/apf27/u-boot-nand.lds b/board/armadeus/apf27/u-boot-nand.lds
new file mode 100644
diff --git a/patches/u-boot/2011.12/425-cortex-relocation.patch b/patches/u-boot/2011.12/330-arm926-relocation.patch
similarity index 59%
copy from patches/u-boot/2011.12/425-cortex-relocation.patch
copy to patches/u-boot/2011.12/330-arm926-relocation.patch
index 6fdcbfc..01b0db6 100644
--- a/patches/u-boot/2011.12/425-cortex-relocation.patch
+++ b/patches/u-boot/2011.12/330-arm926-relocation.patch
@@ -1,4 +1,4 @@
-cortex: Fix jump to the relocated board_init_r
+ARM926: Fix jump to the relocated board_init_r
Jump to the relocated board_init_r according to the initial computation
and remove computation against current PC addr as relocated address is
@@ -8,16 +8,17 @@ already known and fixed.
Signed-off-by: Eric Jarrige <eri...@ar...>
Cc: Stefano Babic <sb...@de...>
---
---- u-boot-custom/arch/arm/cpu/armv7/start.S 2012-01-03 18:46:47.651835000 +0100
-+++ u-boot-custom/arch/arm/cpu/armv7/start.S 2012-01-03 18:48:01.351825420 +0100
-@@ -278,9 +278,7 @@ jump_2_ram:
- mcr p15, 0, r0, c7, c5, 4 @ ISB
- #endif
+--- u-boot-2011.12/arch/arm/cpu/arm926ejs/start.S 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/arch/arm/cpu/arm926ejs/start.S 2012-02-13 23:21:32.829376232 +0100
+@@ -323,9 +323,7 @@ _nand_boot_ofs:
+ .word nand_boot
+ #else
ldr r0, _board_init_r_ofs
-- adr r1, _start
+- ldr r1, _TEXT_BASE
- add lr, r0, r1
- add lr, lr, r9
+ add lr, r0, r6
/* setup parameters for board_init_r */
mov r0, r5 /* gd_t */
mov r1, r6 /* dest_addr */
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-13 22:03:55
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2889b522aae55c6794e0a4fb3f26c42e394f203a (commit)
from d4e694321fd9f87e9d11a8ec6c2085fbb31f6ad3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2889b522aae55c6794e0a4fb3f26c42e394f203a
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 23:03:26 2012 +0100
[UBOOT] apf27: Remove unexpected apf27.h patches
-----------------------------------------------------------------------
Summary of changes:
.../2011.12/305-Define-uart1-for-the-console.patch | 24 -------
...6-Debug-nand-this-patch-should-be-removed.patch | 73 +-------------------
2 files changed, 1 insertions(+), 96 deletions(-)
delete mode 100644 patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
diff --git a/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch b/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
deleted file mode 100644
index 7f00497..0000000
--- a/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 434d5acde85c1277d3ff32597a56e50304fd4081 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Wed, 28 Dec 2011 14:27:48 +0100
-Subject: [PATCH 5/6] Define uart1 for the console
-
----
- include/configs/apf27.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/configs/apf27.h b/include/configs/apf27.h
-index f1602a0..48c73bb 100644
---- a/include/configs/apf27.h
-+++ b/include/configs/apf27.h
-@@ -66,6 +66,7 @@
- #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
- #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
- #define CONFIG_BAUDRATE 115200
-+#define CONFIG_MXC_UART_BASE UART1_BASE
-
- /*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
---
-1.7.4.4
-
diff --git a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
index 5746cda..2ba4946 100644
--- a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
+++ b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
@@ -6,8 +6,7 @@ Subject: [PATCH 6/6] Debug nand, this patch should be removed
---
drivers/mtd/nand/mxc_nand.c | 22 +++++++++++++++++++++-
drivers/mtd/nand/nand_base.c | 2 ++
- include/configs/apf27.h | 16 ++++++++--------
- 3 files changed, 31 insertions(+), 9 deletions(-)
+ 2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 35e89a0..929e228 100644
@@ -76,75 +75,5 @@ index 27f6c77..6107b8b 100644
if (tmp_manf != *maf_id || tmp_id != *dev_id) {
printk(KERN_INFO "%s: second ID read did not match "
"%02x,%02x against %02x,%02x\n", __func__,
-diff --git a/include/configs/apf27.h b/include/configs/apf27.h
-index 48c73bb..162bced 100644
---- a/include/configs/apf27.h
-+++ b/include/configs/apf27.h
-@@ -80,7 +80,7 @@
- #define CONFIG_CMD_BSP /* Board Specific functions */
- #define CONFIG_CMD_CACHE /* icache, dcache */
- #define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
--//#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
-+// #define CONFIG_CMD_DATE /* support for RTC, date/time...*/
- #define CONFIG_CMD_DHCP /* DHCP Support */
- #define CONFIG_CMD_DIAG /* Diagnostics */
- //#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-@@ -358,7 +358,7 @@
- /*
- * SDRAM definition parameter
- */
--#define CONFIG_NR_DRAM_BANKS 1
-+#define CONFIG_NR_DRAM_BANKS 2
-
- #define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
-
-@@ -552,8 +552,8 @@
- //#define CONFIG_MTD_NAND_VERIFY_WRITE 1
- //#define CONFIG_SYS_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
- //#define CONFIG_SYS_NFC_DEBUG
--//#define CONFIG_MTD_DEBUG
--//#define CONFIG_MTD_DEBUG_VERBOSE 3
-+#define CONFIG_MTD_DEBUG
-+#define CONFIG_MTD_DEBUG_VERBOSE 3
-
- /*=====================*/
-
-@@ -787,7 +787,7 @@
- #define CONFIG_SYS_OCR2_B_VAL 0x00000000
- #define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
--#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
-+#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_B_VAL 0x00000000
- #define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
-@@ -805,7 +805,7 @@
- #define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_C_VAL 0x00000000
--#define CONFIG_SYS_GIUS_C_VAL 0xFFFFFFFF
-+#define CONFIG_SYS_GIUS_C_VAL 0xFFFFC07F
- #define CONFIG_SYS_ICR1_C_VAL 0x00000000
- #define CONFIG_SYS_ICR2_C_VAL 0x00000000
- #define CONFIG_SYS_IMR_C_VAL 0x00000000
-@@ -835,7 +835,7 @@
- #define CONFIG_SYS_ICFB1_E_VAL 0xFFFFFFFF
- #define CONFIG_SYS_ICFB2_E_VAL 0xFFFFFFFF
- #define CONFIG_SYS_DR_E_VAL 0x00000000
--#define CONFIG_SYS_GIUS_E_VAL 0xFFFFCCF8
-+#define CONFIG_SYS_GIUS_E_VAL 0xFCFFCCF8
- #define CONFIG_SYS_ICR1_E_VAL 0x00000000
- #define CONFIG_SYS_ICR2_E_VAL 0x00000000
- #define CONFIG_SYS_IMR_E_VAL 0x00000000
-@@ -880,7 +880,7 @@
- #define CONFIG_SYS_AIPI2_PSR1_VAL 0xFFFFFFFF
-
- /* PCCR enable DMA FEC I2C1 IIM SDHC1 */
--#define CONFIG_SYS_PCCR0_VAL 0x05070410
-+#define CONFIG_SYS_PCCR0_VAL 0x05070400
- #define CONFIG_SYS_PCCR1_VAL 0xA14A0408
-
- /* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
---
1.7.4.4
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-13 21:56:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d4e694321fd9f87e9d11a8ec6c2085fbb31f6ad3 (commit)
from 0b7f2f2d61d28989b6ada5d2c7da5f4c5f221925 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d4e694321fd9f87e9d11a8ec6c2085fbb31f6ad3
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 22:56:23 2012 +0100
[UBOOT] apf27: U-Boot 2011.12 default configuration
-----------------------------------------------------------------------
Summary of changes:
...f27-u-boot-2010.03.h => apf27-u-boot-2011.12.h} | 50 +++++++++++++-------
1 files changed, 32 insertions(+), 18 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2010.03.h => apf27-u-boot-2011.12.h} (96%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
similarity index 96%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
copy to buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index 805bf20..2c5e2a2 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -66,6 +66,7 @@
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_BAUDRATE 115200
+#define CONFIG_MXC_UART_BASE UART1_BASE
/*
* Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
@@ -79,15 +80,15 @@
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+// #define CONFIG_CMD_DATE /* support for RTC, date/time...*/
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DIAG /* Diagnostics */
-#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
+//#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
#define CONFIG_CMD_ELF /* bootelf, bootvx */
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_EXT2 /* EXT2 Support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
+//#define CONFIG_CMD_I2C /* I2C serial bus support */
#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
@@ -99,15 +100,15 @@
#define CONFIG_CMD_PING /* ping support */
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
-#define CONFIG_CMD_SNTP /* SNTP support */
+//#define CONFIG_CMD_SNTP /* SNTP support */
#define CONFIG_CMD_NFS /* NFS support */
#define CONFIG_CMD_DNS
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_IMX_FUSE /* iMX fuse access commands */
-#undef CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
/*
* Select some advanced features of the commande line parser
@@ -357,7 +358,7 @@
/*
* SDRAM definition parameter
*/
-#define CONFIG_NR_DRAM_BANKS 1
+#define CONFIG_NR_DRAM_BANKS 2
#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
@@ -511,6 +512,18 @@
#define CONFIG_SYS_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
#endif
+#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
+
+/* lowlevel_linit copy U-Boot at CONFIG_SYS_INIT_SP_ADDR (here in RAM) */
+/* making u-boot runnable from flash and also RAM that is usefull to boot */
+/* from serial port and from flash with only one version of U-Boot */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE 0xA0000000
+#endif
+
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
+ + CONFIG_SYS_SDRAM_1_SIZE - 0x0100000)
+
/*
* Configuration for no NOR FLASH memory
*/
@@ -547,6 +560,7 @@
#define CONFIG_NAND_U_BOOT
#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_LOAD_ADDR /* Copy SPL+U-Boot here */
#define CONFIG_SYS_NAND_U_BOOT_SIZE CONFIG_SYS_MONITOR_LEN /* Size is the partion size */
+
/*
* Environment setup. Definitions of monitor location and size with
* definition of environment setup ends up in 2 possibilities.
@@ -626,7 +640,7 @@
/*-----------------------------------------------------------------------
* FPGA stuff
*/
-#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
+// #define CONFIG_FPGA CONFIG_SYS_SPARTAN3
//#define FPGA_DEBUG
#define CONFIG_FPGA_COUNT 2
#define CONFIG_FPGA_XILINX
@@ -655,14 +669,14 @@
* I2C bus
*/
-#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
+// #define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
-#define CONFIG_SYS_I2C_SLAVE 0x7F
+// #define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
+// #define CONFIG_SYS_I2C_SLAVE 0x7F
-#define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS 2
-#define CONFIG_SYS_I2C_NOPROBES { }
+// #define CONFIG_I2C_CMD_TREE
+// #define CONFIG_I2C_MULTI_BUS 2
+// #define CONFIG_SYS_I2C_NOPROBES { }
# define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
@@ -773,7 +787,7 @@
#define CONFIG_SYS_OCR2_B_VAL 0x00000000
#define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
#define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
-#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
+#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
#define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
#define CONFIG_SYS_DR_B_VAL 0x00000000
#define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
@@ -791,7 +805,7 @@
#define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
#define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
#define CONFIG_SYS_DR_C_VAL 0x00000000
-#define CONFIG_SYS_GIUS_C_VAL 0xFFFFFFFF
+#define CONFIG_SYS_GIUS_C_VAL 0xFFFFC07F
#define CONFIG_SYS_ICR1_C_VAL 0x00000000
#define CONFIG_SYS_ICR2_C_VAL 0x00000000
#define CONFIG_SYS_IMR_C_VAL 0x00000000
@@ -821,7 +835,7 @@
#define CONFIG_SYS_ICFB1_E_VAL 0xFFFFFFFF
#define CONFIG_SYS_ICFB2_E_VAL 0xFFFFFFFF
#define CONFIG_SYS_DR_E_VAL 0x00000000
-#define CONFIG_SYS_GIUS_E_VAL 0xFFFFCCF8
+#define CONFIG_SYS_GIUS_E_VAL 0xFCFFCCF8
#define CONFIG_SYS_ICR1_E_VAL 0x00000000
#define CONFIG_SYS_ICR2_E_VAL 0x00000000
#define CONFIG_SYS_IMR_E_VAL 0x00000000
@@ -866,7 +880,7 @@
#define CONFIG_SYS_AIPI2_PSR1_VAL 0xFFFFFFFF
/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-#define CONFIG_SYS_PCCR0_VAL 0x05070410
+#define CONFIG_SYS_PCCR0_VAL 0x05070400
#define CONFIG_SYS_PCCR1_VAL 0xA14A0408
/* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-13 21:54:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0b7f2f2d61d28989b6ada5d2c7da5f4c5f221925 (commit)
via dce448662a155fe7a716a9b8da93b17326b5264d (commit)
via 69f54d1f9df08c8ae7148367f5a976773f4a28b9 (commit)
via 7ef82f0f19b3c2304a0e1a1f300a29d7ebe3356c (commit)
via d6eee0236270b6c5a889cd6cf442f81465003784 (commit)
via 6dd0e4e1c5abfc334a78f0981d9ac6a85ce34e9d (commit)
via 760e53ea5896de8c08ac5769f1a94ed66d04c34b (commit)
from 50d319fed0e399971bef3267b1e339def413e49e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b7f2f2d61d28989b6ada5d2c7da5f4c5f221925
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 22:54:10 2012 +0100
[UBOOT] apf27: import mx27 NAND SPL from U-Boot 2010.03
commit dce448662a155fe7a716a9b8da93b17326b5264d
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:51:21 2012 +0100
[UBOOT] apf27:[PATCH 6/6] Debug nand, this patch should be removed
commit 69f54d1f9df08c8ae7148367f5a976773f4a28b9
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:50:33 2012 +0100
[UBOOT] apf27:[PATCH 5/6] Define uart1 for the console
commit 7ef82f0f19b3c2304a0e1a1f300a29d7ebe3356c
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:49:54 2012 +0100
[UBOOT] apf27:[PATCH 4/6] Add type for apf27
commit d6eee0236270b6c5a889cd6cf442f81465003784
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:49:23 2012 +0100
[UBOOT] apf27:[PATCH 3/6] Remove useless code in apf27
commit 6dd0e4e1c5abfc334a78f0981d9ac6a85ce34e9d
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:48:02 2012 +0100
[UBOOT] apf27:[PATCH 2/6] Add support for the armadeus apf27 board
commit 760e53ea5896de8c08ac5769f1a94ed66d04c34b
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 13 22:31:52 2012 +0100
[UBOOT] apf27:[PATCH 1/6] Add GPIO Module and I/O Multiplexer constant for mx27
-----------------------------------------------------------------------
Summary of changes:
...dule-and-I-O-Multiplexer-constant-for-mx2.patch | 238 +++++++
...-Add-support-for-the-armadeus-apf27-board.patch | 726 ++++++++++++++++++++
.../2011.12/303-Remove-useless-code-in-apf27.patch | 76 ++
.../u-boot/2011.12/304-Add-type-for-apf27.patch | 24 +
.../2011.12/305-Define-uart1-for-the-console.patch | 24 +
...6-Debug-nand-this-patch-should-be-removed.patch | 150 ++++
patches/u-boot/2011.12/310-apf27-nand-spl.patch | 721 +++++++++++++++++++
7 files changed, 1959 insertions(+), 0 deletions(-)
create mode 100644 patches/u-boot/2011.12/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
create mode 100644 patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
create mode 100644 patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
create mode 100644 patches/u-boot/2011.12/304-Add-type-for-apf27.patch
create mode 100644 patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
create mode 100644 patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
create mode 100644 patches/u-boot/2011.12/310-apf27-nand-spl.patch
diff --git a/patches/u-boot/2011.12/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch b/patches/u-boot/2011.12/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
new file mode 100644
index 0000000..c60fcba
--- /dev/null
+++ b/patches/u-boot/2011.12/301-Add-GPIO-Module-and-I-O-Multiplexer-constant-for-mx2.patch
@@ -0,0 +1,238 @@
+From c454b2c2ed3a4be1a0809c0f0fa49f46559e1fa6 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Sun, 25 Sep 2011 11:22:00 +0200
+Subject: [PATCH 1/6] Add GPIO Module and I/O Multiplexer constant for mx27
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/include/asm/arch-mx27/imx-regs.h | 216 +++++++++++++++++++++++++++++
+ 1 files changed, 216 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
+index ced5b2a..f1c0ce7 100644
+--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
++++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
+@@ -522,4 +522,220 @@ struct fuse_bank0_regs {
+ #define IIM_ERR_SNSE (1 << 2)
+ #define IIM_ERR_PARITYE (1 << 1)
+
++/* IIM Control Registers */
++#define IIM_BANK_AREA IMX_IIM_BASE + 0x800
++#define IIM_BANK_REG(x,y) (IIM_BANK_AREA + 0x400 * x + (y<<2))
++
++# ifdef __ASSEMBLY__
++# define __REG(x) (x)
++# define __REG16(x) (x)
++# define __REG2(x,y) ((x)+(y))
++
++/*
++ * GPIO Module and I/O Multiplexer
++ */
++#define PORTA 0
++#define PORTB 1
++#define PORTC 2
++#define PORTD 3
++#define PORTE 4
++#define PORTF 5
++
++#define AIPI1_PSR0 __REG(IMX_AIPI1_BASE + 0x00)
++#define AIPI1_PSR1 __REG(IMX_AIPI1_BASE + 0x04)
++#define AIPI2_PSR0 __REG(IMX_AIPI2_BASE + 0x00)
++#define AIPI2_PSR1 __REG(IMX_AIPI2_BASE + 0x04)
++
++/* System Control */
++#define FMCR __REG(IMX_SYSTEM_CTL_BASE + 0x14)
++#define GPCR __REG(IMX_SYSTEM_CTL_BASE + 0x18)
++#define WBCR __REG(IMX_SYSTEM_CTL_BASE + 0x1C)
++#define DSCR1 __REG(IMX_SYSTEM_CTL_BASE + 0x20)
++#define DSCR2 __REG(IMX_SYSTEM_CTL_BASE + 0x24)
++#define DSCR3 __REG(IMX_SYSTEM_CTL_BASE + 0x28)
++#define DSCR4 __REG(IMX_SYSTEM_CTL_BASE + 0x2C)
++#define DSCR5 __REG(IMX_SYSTEM_CTL_BASE + 0x30)
++#define DSCR6 __REG(IMX_SYSTEM_CTL_BASE + 0x34)
++#define DSCR7 __REG(IMX_SYSTEM_CTL_BASE + 0x38)
++#define DSCR8 __REG(IMX_SYSTEM_CTL_BASE + 0x3C)
++#define DSCR9 __REG(IMX_SYSTEM_CTL_BASE + 0x40)
++#define DSCR10 __REG(IMX_SYSTEM_CTL_BASE + 0x44)
++#define DSCR11 __REG(IMX_SYSTEM_CTL_BASE + 0x48)
++#define DSCR12 __REG(IMX_SYSTEM_CTL_BASE + 0x4C)
++#define DSCR13 __REG(IMX_SYSTEM_CTL_BASE + 0x50)
++#define PSCR __REG(IMX_SYSTEM_CTL_BASE + 0x54)
++#define PMCR __REG(IMX_SYSTEM_CTL_BASE + 0x58)
++#define DCVR0 __REG(IMX_SYSTEM_CTL_BASE + 0x60)
++#define DCVR1 __REG(IMX_SYSTEM_CTL_BASE + 0x64)
++#define DCVR2 __REG(IMX_SYSTEM_CTL_BASE + 0x68)
++#define DCVR3 __REG(IMX_SYSTEM_CTL_BASE + 0x6C)
++
++/* Chip Select Registers */
++#define CS0U __REG(IMX_WEIM_BASE + 0x00) /* Chip Select 0 Upper Register */
++#define CS0L __REG(IMX_WEIM_BASE + 0x04) /* Chip Select 0 Lower Register */
++#define CS0A __REG(IMX_WEIM_BASE + 0x08) /* Chip Select 0 Addition Register */
++#define CS1U __REG(IMX_WEIM_BASE + 0x10) /* Chip Select 1 Upper Register */
++#define CS1L __REG(IMX_WEIM_BASE + 0x14) /* Chip Select 1 Lower Register */
++#define CS1A __REG(IMX_WEIM_BASE + 0x18) /* Chip Select 1 Addition Register */
++#define CS2U __REG(IMX_WEIM_BASE + 0x20) /* Chip Select 2 Upper Register */
++#define CS2L __REG(IMX_WEIM_BASE + 0x24) /* Chip Select 2 Lower Register */
++#define CS2A __REG(IMX_WEIM_BASE + 0x28) /* Chip Select 2 Addition Register */
++#define CS3U __REG(IMX_WEIM_BASE + 0x30) /* Chip Select 3 Upper Register */
++#define CS3L __REG(IMX_WEIM_BASE + 0x34) /* Chip Select 3 Lower Register */
++#define CS3A __REG(IMX_WEIM_BASE + 0x38) /* Chip Select 3 Addition Register */
++#define CS4U __REG(IMX_WEIM_BASE + 0x40) /* Chip Select 4 Upper Register */
++#define CS4L __REG(IMX_WEIM_BASE + 0x44) /* Chip Select 4 Lower Register */
++#define CS4A __REG(IMX_WEIM_BASE + 0x48) /* Chip Select 4 Addition Register */
++#define CS5U __REG(IMX_WEIM_BASE + 0x50) /* Chip Select 5 Upper Register */
++#define CS5L __REG(IMX_WEIM_BASE + 0x54) /* Chip Select 5 Lower Register */
++#define CS5A __REG(IMX_WEIM_BASE + 0x58) /* Chip Select 5 Addition Register */
++#define EIM __REG(IMX_WEIM_BASE + 0x60) /* WEIM Configuration Register */
++
++/* SDRAM Controller registers */
++#define ESDCTL0 __REG(IMX_ESD_BASE + 0x00) /* Enhanced SDRAM Control Register 0 */
++#define ESDCFG0 __REG(IMX_ESD_BASE + 0x04) /* Enhanced SDRAM Configuration Register 0 */
++#define ESDCTL1 __REG(IMX_ESD_BASE + 0x08) /* Enhanced SDRAM Control Register 1 */
++#define ESDCFG1 __REG(IMX_ESD_BASE + 0x0C) /* Enhanced SDRAM Configuration Register 1 */
++#define ESDMISC __REG(IMX_ESD_BASE + 0x10) /* Enhanced SDRAM Miscellanious Register */
++
++/* PLL registers */
++#define CSCR __REG(IMX_PLL_BASE + 0x00) /* Clock Source Control Register */
++#define MPCTL0 __REG(IMX_PLL_BASE + 0x04) /* MCU PLL Control Register 0 */
++#define MPCTL1 __REG(IMX_PLL_BASE + 0x08) /* MCU PLL Control Register 1 */
++#define SPCTL0 __REG(IMX_PLL_BASE + 0x0c) /* System PLL Control Register 0 */
++#define SPCTL1 __REG(IMX_PLL_BASE + 0x10) /* System PLL Control Register 1 */
++#define OSC26MCTL __REG(IMX_PLL_BASE + 0x14) /* Oscillator 26M Register */
++#define PCDR0 __REG(IMX_PLL_BASE + 0x18) /* Peripheral Clock Divider Register 0 */
++#define PCDR1 __REG(IMX_PLL_BASE + 0x1c) /* Peripheral Clock Divider Register 1 */
++#define PCCR0 __REG(IMX_PLL_BASE + 0x20) /* Peripheral Clock Control Register 0 */
++#define PCCR1 __REG(IMX_PLL_BASE + 0x24) /* Peripheral Clock Control Register 1 */
++#define CCSR __REG(IMX_PLL_BASE + 0x28) /* Clock Control Status Register */
++
++#define DDIR(x) __REG2(IMX_GPIO_BASE + 0x00, ((x) & 7) << 8)
++#define OCR1(x) __REG2(IMX_GPIO_BASE + 0x04, ((x) & 7) << 8)
++#define OCR2(x) __REG2(IMX_GPIO_BASE + 0x08, ((x) & 7) << 8)
++#define ICONFA1(x) __REG2(IMX_GPIO_BASE + 0x0c, ((x) & 7) << 8)
++#define ICONFA2(x) __REG2(IMX_GPIO_BASE + 0x10, ((x) & 7) << 8)
++#define ICONFB1(x) __REG2(IMX_GPIO_BASE + 0x14, ((x) & 7) << 8)
++#define ICONFB2(x) __REG2(IMX_GPIO_BASE + 0x18, ((x) & 7) << 8)
++#define DR(x) __REG2(IMX_GPIO_BASE + 0x1c, ((x) & 7) << 8)
++#define GIUS(x) __REG2(IMX_GPIO_BASE + 0x20, ((x) & 7) << 8)
++#define SSR(x) __REG2(IMX_GPIO_BASE + 0x24, ((x) & 7) << 8)
++#define ICR1(x) __REG2(IMX_GPIO_BASE + 0x28, ((x) & 7) << 8)
++#define ICR2(x) __REG2(IMX_GPIO_BASE + 0x2c, ((x) & 7) << 8)
++#define IMR(x) __REG2(IMX_GPIO_BASE + 0x30, ((x) & 7) << 8)
++#define ISR(x) __REG2(IMX_GPIO_BASE + 0x34, ((x) & 7) << 8)
++#define GPR(x) __REG2(IMX_GPIO_BASE + 0x38, ((x) & 7) << 8)
++#define SWR(x) __REG2(IMX_GPIO_BASE + 0x3c, ((x) & 7) << 8)
++#define PUEN(x) __REG2(IMX_GPIO_BASE + 0x40, ((x) & 7) << 8)
++
++ /* Macros to get byte and bit positions of ECC
++ */
++#define COLPOS(x) ((x) >> 4)
++#define BITPOS(x) ((x)& 0xf)
++
++/**
++ * Memory areas of the NFC
++ */
++#define IMX_NFC_BASE (0xD8000000)
++#define IMX_NFC_MAIN_AREA0 (0xD8000000)
++#define IMX_NFC_MAIN_AREA1 (0xD8000200)
++#define IMX_NFC_SPARE_AREA0 (0xD8000800)
++#define IMX_NFC_REGS (0xD8000E00)
++
++/*
++ * NFC registers address offest
++ */
++#define NFC_OFFSET_BUFSIZE (0x00) /* Internal SRAM Size */
++#define NFC_OFFSET_BLCK_ADD_LOCK (0x02) /* NAND Flash Block Address for Lock Check */
++#define NFC_OFFSET_BUF_ADDR (0x04) /* Buffer Number for Page Data Transfer To/
++ From Flash Memory */
++#define NFC_OFFSET_FLASH_ADDR (0x06) /* NAND Flash Address */
++#define NFC_OFFSET_FLASH_CMD (0x08) /* NAND Flash Command */
++#define NFC_OFFSET_CONFIG (0x0A) /* NFC Internal Buffer Lock Control */
++#define NFC_OFFSET_ECC_STATUS_RESULT (0x0C) /* Controller Status/Result of Flash Operation */
++#define NFC_OFFSET_ECC_RSLT_MAIN_AREA (0x0E) /* ECC Error Position of Main Area Data Error */
++#define NFC_OFFSET_ECC_RSLT_SPARE_AREA (0x10) /* ECC Error Position of Spare Area Data Error */
++#define NFC_OFFSET_WRPROT (0x12) /* Nand Flash Write Protection */
++#define NFC_OFFSET_UNLOCKSTART_BLKADDR (0x14) /* Start Address for Write Protection Unlock */
++#define NFC_OFFSET_UNLOCKEND_BLKADDR (0x16) /* End Address for Write Protection Unlock */
++#define NFC_OFFSET_WRPR_STAT (0x18) /* Current Nand Flash Write Protection Status */
++#define NFC_OFFSET_CONFIG1 (0x1A) /* Nand Flash Operation Configuration 1 */
++#define NFC_OFFSET_CONFIG2 (0x1C) /* Nand Flash Operation Configuration 2 */
++
++/*
++ * NFC registers
++ */
++ /* Internal SRAM Size */
++#define NFC_BUFSIZE __REG16(IMX_NFC_REGS + NFC_OFFSET_BUFSIZE)
++ /* NAND Flash Block Address for Lock Check */
++#define NFC_BLCK_ADD_LOCK __REG16(IMX_NFC_REGS + NFC_OFFSET_BLCK_ADD_LOCK)
++ /* Buffer Number for Page Data Transfer To From Flash Memory */
++#define NFC_BUF_ADDR __REG16(IMX_NFC_REGS + NFC_OFFSET_BUF_ADDR)
++ /* NAND Flash Address */
++#define NFC_FLASH_ADDR __REG16(IMX_NFC_REGS + NFC_OFFSET_FLASH_ADDR)
++ /* NAND Flash Command */
++#define NFC_FLASH_CMD __REG16(IMX_NFC_REGS + NFC_OFFSET_FLASH_CMD)
++ /* NFC Internal Buffer Lock Control */
++#define NFC_CONFIG __REG16(IMX_NFC_REGS + NFC_OFFSET_CONFIG)
++ /* Controller Status/Result of Flash Operation */
++#define NFC_ECC_STATUS_RESULT __REG16(IMX_NFC_REGS + NFC_OFFSET_ECC_STATUS_RESULT)
++ /* ECC Error Position of Main Area Data Error */
++#define NFC_ECC_RSLT_MAIN_AREA __REG16(IMX_NFC_REGS + NFC_OFFSET_ECC_RSLT_MAIN_AREA)
++ /* ECC Error Position of Spare Area Data Error */
++#define NFC_ECC_RSLT_SPARE_AREA __REG16(IMX_NFC_REGS + NFC_OFFSET_ECC_RSLT_SPARE_AREA)
++ /* Nand Flash Write Protection */
++#define NFC_WRPROT __REG16(IMX_NFC_REGS + NFC_OFFSET_WRPROT)
++ /* Start Address for Write Protection Unlock */
++#define NFC_UNLOCKSTART_BLKADDR __REG16(IMX_NFC_REGS + NFC_OFFSET_UNLOCKSTART_BLKADDR)
++ /* End Address for Write Protection Unlock */
++#define NFC_UNLOCKEND_BLKADDR __REG16(IMX_NFC_REGS + NFC_OFFSET_UNLOCKEND_BLKADDR)
++ /* Current Nand Flash Write Protection Status */
++#define NFC_WRPR_STAT __REG16(IMX_NFC_REGS + NFC_OFFSET_WRPR_STAT)
++ /* Nand Flash Operation Configuration 1 */
++#define NFC_CONFIG1 __REG16(IMX_NFC_REGS + NFC_OFFSET_CONFIG1)
++ /* Nand Flash Operation Configuration 2 */
++#define NFC_CONFIG2 __REG16(IMX_NFC_REGS + NFC_OFFSET_CONFIG2)
++
++/* NFC_ECC_STATUS_RESULT Status Register Bit Fields */
++#define NFC_ECC_STAT_ERM_SHFT (2) /* ERM shift */
++#define NFC_ECC_STAT_ERS_MASK (0x03) /* ERS mask */
++#define NFC_ECC_STAT_ERROR1 (1<<0) /* correctable error */
++#define NFC_ECC_STAT_ERROR2 (1<<1) /* non correctable error */
++
++/* NFC_CONFIG Control Register Bit Fields */
++#define NFC_CONFIG_UNLOCKED (1<<1) /* unlocked */
++#define NFC_CONFIG_LOCKED (1<<0) /* locked */
++/* NFC_WRPROT Control Register Bit Fields */
++#define NFC_WRPROT_UNLOCKBLK (4<<0) /* unlock block according to given address range */
++#define NFC_WRPROT_LOCKALL (2<<0) /* lock all */
++#define NFC_WRPROT_LOCKTIGHT (1<<0) /* lock-tight locked blocks */
++/* NFC_WRPR_STAT Status Register Bit Fields */
++#define NFC_WRPR_US (1<<2) /* Unlocked status */
++#define NFC_WRPR_LS (1<<1) /* Locked status */
++#define NFC_WRPR_LTS (1<<0) /* Lock-tight Status */
++/* NFC_CONFIG1 Control Register Bit Fields */
++#define NFC_CONFIG1_CEn (1<<7) /* Flash force CE */
++#define NFC_CONFIG1_RST (1<<6) /* Reset */
++#define NFC_CONFIG1_BIG (1<<5) /* Big Endian Mode */
++#define NFC_CONFIG1_INT_MSK (1<<4) /* Mask Interrupt Bit */
++#define NFC_CONFIG1_ECC_EN (1<<3) /* ECC operation enable */
++#define NFC_CONFIG1_SP_EN (1<<2) /* Flash spare enable */
++/* NFC_CONFIG2 Control Register Bit Fields */
++#define NFC_CONFIG2_INT (1<<15) /* Interrupt */
++#define NFC_CONFIG2_FDO_STATUS (4<<3) /* Flash status output */
++#define NFC_CONFIG2_FDO_ID (2<<3) /* Flash ID output */
++#define NFC_CONFIG2_FDO_PAGE (1<<3) /* Flash data output */
++#define NFC_CONFIG2_FDI (1<<2) /* Flash data input */
++#define NFC_CONFIG2_FADD (1<<1) /* Flash address input */
++#define NFC_CONFIG2_FCMD (1<<0) /* Flash command input */
++
++#define NAND_CMD_LOCK 0x2a
++#define NAND_CMD_LOCK_TIGHT 0x2c
++#define NAND_CMD_UNLOCK1 0x23
++#define NAND_CMD_UNLOCK2 0x24
++#define NAND_CMD_LOCK_STATUS 0x7a
++
++#endif
++
+ #endif /* _IMX_REGS_H */
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
new file mode 100644
index 0000000..6f4b9e9
--- /dev/null
+++ b/patches/u-boot/2011.12/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -0,0 +1,726 @@
+From fe25e4695b704742eee8ff6e0d01cf0c3413dbd3 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Sun, 25 Sep 2011 11:25:10 +0200
+Subject: [PATCH 2/6] Add support for the armadeus apf27 board
+
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ board/armadeus/apf27/Makefile | 50 ++
+ board/armadeus/apf27/apf27.c | 200 +++++++
+ board/armadeus/apf27/config.mk | 13 +
+ board/armadeus/apf27/lowlevel_init.S | 343 ++++++++++++
+ board/armadeus/apf27/u-boot-nand.lds | 56 ++
+ boards.cfg | 1 +
+ 6 files changed, 1649 insertions(+), 0 deletions(-)
+ create mode 100644 board/armadeus/apf27/Makefile
+ create mode 100644 board/armadeus/apf27/apf27.c
+ create mode 100644 board/armadeus/apf27/config.mk
+ create mode 100644 board/armadeus/apf27/lowlevel_init.S
+ create mode 100644 board/armadeus/apf27/u-boot-nand.lds
+
+diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
+new file mode 100644
+index 0000000..2a0f7d8
+--- /dev/null
++++ b/board/armadeus/apf27/Makefile
+@@ -0,0 +1,50 @@
++#
++# (C) Copyright 2000-2004
++# Wolfgang Denk, DENX Software Engineering, wd...@de....
++#
++# 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 $(TOPDIR)/config.mk
++
++LIB = $(obj)lib$(BOARD).o
++
++COBJS := apf27.o
++SOBJS := lowlevel_init.o
++
++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS := $(addprefix $(obj),$(COBJS))
++SOBJS := $(addprefix $(obj),$(SOBJS))
++
++$(LIB): $(obj).depend $(OBJS) $(SOBJS)
++ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
++
++clean:
++ rm -f $(SOBJS) $(OBJS)
++
++distclean: clean
++ rm -f $(LIB) core *.bak $(obj).depend
++
++#########################################################################
++
++include $(SRCTREE)/rules.mk
++
++sinclude $(obj).depend
++
++#########################################################################
+diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
+new file mode 100644
+index 0000000..e08b7a2
+--- /dev/null
++++ b/board/armadeus/apf27/apf27.c
+@@ -0,0 +1,200 @@
++/*
++ * Copyright (C) 2007 Sascha Hauer, Pengutronix
++ * Copyright (C) 2008,2009 Eric Jarrige <jo...@us...>
++ *
++ * 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 <common.h>
++#include "crc.h"
++#include "fpga.h"
++#include <nand.h>
++#include <asm/arch/imx-regs.h>
++
++DECLARE_GLOBAL_DATA_PTR;
++
++static int read_firmware (size_t offset, size_t end, u_char * buf)
++{
++ size_t amount_loaded = 0;
++ size_t blocksize;
++
++ u_char *char_ptr;
++
++ blocksize = nand_info[0].erasesize;
++
++ while (offset < end) {
++ if (nand_block_isbad(&nand_info[0], offset)) {
++ offset += blocksize;
++ } else {
++ char_ptr = &buf[amount_loaded];
++ if (nand_read(&nand_info[0], offset, &blocksize, char_ptr))
++ return 1;
++ offset += blocksize;
++ amount_loaded += blocksize;
++ }
++ }
++
++ return amount_loaded;
++}
++
++
++static int apf27_devices_init(void)
++{
++ int i;
++ unsigned int mode[] = {
++ PD0_AIN_FEC_TXD0,
++ PD1_AIN_FEC_TXD1,
++ PD2_AIN_FEC_TXD2,
++ PD3_AIN_FEC_TXD3,
++ PD4_AOUT_FEC_RX_ER,
++ PD5_AOUT_FEC_RXD1,
++ PD6_AOUT_FEC_RXD2,
++ PD7_AOUT_FEC_RXD3,
++ PD8_AF_FEC_MDIO,
++ PD9_AIN_FEC_MDC | GPIO_PUEN,
++ PD10_AOUT_FEC_CRS,
++ PD11_AOUT_FEC_TX_CLK,
++ PD12_AOUT_FEC_RXD0,
++ PD13_AOUT_FEC_RX_DV,
++ PD14_AOUT_FEC_CLR,
++ PD15_AOUT_FEC_COL,
++ PD16_AIN_FEC_TX_ER,
++ PF23_AIN_FEC_TX_EN,
++ PE12_PF_UART1_TXD,
++ PE13_PF_UART1_RXD,
++ };
++
++ for (i = 0; i < ARRAY_SIZE(mode); i++)
++ imx_gpio_mode(mode[i]);
++
++#ifdef CONFIG_MXC_MMC
++ mx27_sd2_init_pins();
++#endif
++ return 0;
++}
++
++int board_mmc_init(bd_t *bis)
++{
++ return -1;
++}
++int
++board_init (void)
++{
++
++ gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
++ gd->bd->bi_boot_params = CONFIG_BOOT_PARAMS_ADDR;
++
++ /* On apf27 U-Boot is always in the relocatated stated */
++ gd->flags |= GD_FLG_RELOC;
++
++ apf27_devices_init();
++
++ return 0;
++}
++
++int
++dram_init (void)
++{
++ /* dram_init must store complete ramsize in gd->ram_size */
++ gd->ram_size = 0;
++#if ( CONFIG_NR_DRAM_BANKS > 0 )
++ gd->ram_size += get_ram_size((void *)CONFIG_SYS_SDRAM_1_BASE,
++ CONFIG_SYS_SDRAM_1_SIZE);
++#endif
++#if ( CONFIG_NR_DRAM_BANKS > 1 )
++ gd->ram_size += get_ram_size((void *)CONFIG_SYS_SDRAM_2_BASE,
++ CONFIG_SYS_SDRAM_2_SIZE);
++#endif
++ return 0;
++}
++
++void dram_init_banksize(void)
++{
++#if ( CONFIG_NR_DRAM_BANKS > 0 )
++ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_1_BASE;
++ gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_1_SIZE;
++#endif
++#if ( CONFIG_NR_DRAM_BANKS > 1 )
++ gd->bd->bi_dram[1].start = CONFIG_SYS_SDRAM_2_BASE;
++ gd->bd->bi_dram[1].size = CONFIG_SYS_SDRAM_2_SIZE;
++#endif
++}
++
++/*
++ * Miscellaneous intialization
++ */
++int
++misc_init_r (void)
++{
++ char *s;
++ u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
++ size_t end = 0;
++ size_t size = 0;
++ size_t offset = -1;
++ char *autoload = getenv ("firmware_autoload");
++
++#if defined(CONFIG_FPGA)
++ /* init and download fpga */
++ if (( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if ((s = getenv("firmware_offset")) != NULL) {
++ offset = simple_strtoul(s, NULL, 16);
++ }
++ if ((s = getenv("firmware_len")) != NULL) {
++ end = offset + simple_strtoul(s, NULL, 16);
++ }
++ if ((-1 != offset) && (offset != end)) {
++ size = read_firmware (offset, end, firmware_buffer);
++ }
++ }
++ APF27_init_fpga (firmware_buffer, size);
++#endif
++
++ /* detect compatibility issue of environment version */
++ s = getenv ("env_version");
++ if (( NULL == s ) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++ printf("*** Warning - Environment version change suggests: "
++ "run flash_reset_env; reset\n");
++ }
++
++ /* Unlock whole flash but U-Boot */
++ s = getenv ("env_offset");
++ offset = CONFIG_ENV_OFFSET;
++ if ((s != NULL) && (0 != strcmp(s, "0"))) {
++ offset = simple_strtoul(s, NULL, 16);
++ }
++
++ if (nand_unlock(&nand_info[0], offset, nand_info[0].size - offset)) {
++ printf("NAND flash lock/unlocked failed\n");
++ }
++
++
++ return 0;
++}
++
++void
++show_boot_progress (int status)
++{
++#ifdef CONFIG_SHOW_BOOT_PROGRESS
++#endif
++ return;
++}
++
++int checkboard(void)
++{
++ printf("Armadeus APF27\n");
++ return 0;
++}
+diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
+new file mode 100644
+index 0000000..3354ba0
+--- /dev/null
++++ b/board/armadeus/apf27/config.mk
+@@ -0,0 +1,13 @@
++#
++# This config file is used for compilation of armadeus sources
++#
++# You might change location of U-Boot in memory by setting right TEXT_BASE.
++# This allows for example having one copy located at the end of ram and stored
++# in flash device and later on while developing use other location to test
++# the code in RAM device only.
++#
++
++ifndef TEXT_BASE
++TEXT_BASE = 0xAFF00000
++endif
++# CONFIG_NAND_U_BOOT = y
+diff --git a/board/armadeus/apf27/lowlevel_init.S b/board/armadeus/apf27/lowlevel_init.S
+new file mode 100644
+index 0000000..4d72d8c
+--- /dev/null
++++ b/board/armadeus/apf27/lowlevel_init.S
+@@ -0,0 +1,343 @@
++/*
++ * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
++ * Applications Processor Reference Manual, Rev. 0.2".
++ *
++ * (C) Copyright 2008 Eric Jarrige <eri...@ar...>
++ *
++ * 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 <config.h>
++#include <version.h>
++#include <asm/arch/imx-regs.h>
++
++
++
++#define writel(reg, val) \
++ ldr r0, =reg; \
++ ldr r1, =val; \
++ str r1, [r0];
++
++.macro port_init
++ writel( FMCR, CONFIG_SYS_FMCR_VAL)
++/* PORTA */
++ writel( DR(PORTA), CONFIG_SYS_DR_A_VAL)
++ writel( OCR1(PORTA), CONFIG_SYS_OCR1_A_VAL)
++ writel( OCR2(PORTA), CONFIG_SYS_OCR2_A_VAL)
++ writel( ICONFA1(PORTA), CONFIG_SYS_ICFA1_A_VAL)
++ writel( ICONFA2(PORTA), CONFIG_SYS_ICFA2_A_VAL)
++ writel( ICONFB1(PORTA), CONFIG_SYS_ICFB1_A_VAL)
++ writel( ICONFB2(PORTA), CONFIG_SYS_ICFB2_A_VAL)
++ writel( ICR1(PORTA), CONFIG_SYS_ICR1_A_VAL)
++ writel( ICR2(PORTA), CONFIG_SYS_ICR2_A_VAL)
++ writel( IMR(PORTA), CONFIG_SYS_IMR_A_VAL)
++ writel( DDIR(PORTA), CONFIG_SYS_DDIR_A_VAL)
++ writel( GPR(PORTA), CONFIG_SYS_GPR_A_VAL)
++ writel( PUEN(PORTA), CONFIG_SYS_PUEN_A_VAL)
++ writel( GIUS(PORTA), CONFIG_SYS_GIUS_A_VAL)
++/* PORTB */
++ writel( DR(PORTB), CONFIG_SYS_DR_B_VAL)
++ writel( OCR1(PORTB), CONFIG_SYS_OCR1_B_VAL)
++ writel( OCR2(PORTB), CONFIG_SYS_OCR2_B_VAL)
++ writel( ICONFA1(PORTB), CONFIG_SYS_ICFA1_B_VAL)
++ writel( ICONFA2(PORTB), CONFIG_SYS_ICFA2_B_VAL)
++ writel( ICONFB1(PORTB), CONFIG_SYS_ICFB1_B_VAL)
++ writel( ICONFB2(PORTB), CONFIG_SYS_ICFB2_B_VAL)
++ writel( ICR1(PORTB), CONFIG_SYS_ICR1_B_VAL)
++ writel( ICR2(PORTB), CONFIG_SYS_ICR2_B_VAL)
++ writel( IMR(PORTB), CONFIG_SYS_IMR_B_VAL)
++ writel( DDIR(PORTB), CONFIG_SYS_DDIR_B_VAL)
++ writel( GPR(PORTB), CONFIG_SYS_GPR_B_VAL)
++ writel( PUEN(PORTB), CONFIG_SYS_PUEN_B_VAL)
++ writel( GIUS(PORTB), CONFIG_SYS_GIUS_B_VAL)
++/* PORTC */
++ writel( DR(PORTC), CONFIG_SYS_DR_C_VAL)
++ writel( OCR1(PORTC), CONFIG_SYS_OCR1_C_VAL)
++ writel( OCR2(PORTC), CONFIG_SYS_OCR2_C_VAL)
++ writel( ICONFA1(PORTC), CONFIG_SYS_ICFA1_C_VAL)
++ writel( ICONFA2(PORTC), CONFIG_SYS_ICFA2_C_VAL)
++ writel( ICONFB1(PORTC), CONFIG_SYS_ICFB1_C_VAL)
++ writel( ICONFB2(PORTC), CONFIG_SYS_ICFB2_C_VAL)
++ writel( ICR1(PORTC), CONFIG_SYS_ICR1_C_VAL)
++ writel( ICR2(PORTC), CONFIG_SYS_ICR2_C_VAL)
++ writel( IMR(PORTC), CONFIG_SYS_IMR_C_VAL)
++ writel( DDIR(PORTC), CONFIG_SYS_DDIR_C_VAL)
++ writel( GPR(PORTC), CONFIG_SYS_GPR_C_VAL)
++ writel( PUEN(PORTC), CONFIG_SYS_PUEN_C_VAL)
++ writel( GIUS(PORTC), CONFIG_SYS_GIUS_C_VAL)
++/* PORTD */
++ writel( DR(PORTD), CONFIG_SYS_DR_D_VAL)
++ writel( OCR1(PORTD), CONFIG_SYS_OCR1_D_VAL)
++ writel( OCR2(PORTD), CONFIG_SYS_OCR2_D_VAL)
++ writel( ICONFA1(PORTD), CONFIG_SYS_ICFA1_D_VAL)
++ writel( ICONFA2(PORTD), CONFIG_SYS_ICFA2_D_VAL)
++ writel( ICONFB1(PORTD), CONFIG_SYS_ICFB1_D_VAL)
++ writel( ICONFB2(PORTD), CONFIG_SYS_ICFB2_D_VAL)
++ writel( ICR1(PORTD), CONFIG_SYS_ICR1_D_VAL)
++ writel( ICR2(PORTD), CONFIG_SYS_ICR2_D_VAL)
++ writel( IMR(PORTD), CONFIG_SYS_IMR_D_VAL)
++ writel( DDIR(PORTD), CONFIG_SYS_DDIR_D_VAL)
++ writel( GPR(PORTD), CONFIG_SYS_GPR_D_VAL)
++ writel( PUEN(PORTD), CONFIG_SYS_PUEN_D_VAL)
++ writel( GIUS(PORTD), CONFIG_SYS_GIUS_D_VAL)
++/* PORTE */
++ writel( DR(PORTE), CONFIG_SYS_DR_E_VAL)
++ writel( OCR1(PORTE), CONFIG_SYS_OCR1_E_VAL)
++ writel( OCR2(PORTE), CONFIG_SYS_OCR2_E_VAL)
++ writel( ICONFA1(PORTE), CONFIG_SYS_ICFA1_E_VAL)
++ writel( ICONFA2(PORTE), CONFIG_SYS_ICFA2_E_VAL)
++ writel( ICONFB1(PORTE), CONFIG_SYS_ICFB1_E_VAL)
++ writel( ICONFB2(PORTE), CONFIG_SYS_ICFB2_E_VAL)
++ writel( ICR1(PORTE), CONFIG_SYS_ICR1_E_VAL)
++ writel( ICR2(PORTE), CONFIG_SYS_ICR2_E_VAL)
++ writel( IMR(PORTE), CONFIG_SYS_IMR_E_VAL)
++ writel( DDIR(PORTE), CONFIG_SYS_DDIR_E_VAL)
++ writel( GPR(PORTE), CONFIG_SYS_GPR_E_VAL)
++ writel( PUEN(PORTE), CONFIG_SYS_PUEN_E_VAL)
++ writel( GIUS(PORTE), CONFIG_SYS_GIUS_E_VAL)
++/* PORTF */
++ writel( DR(PORTF), CONFIG_SYS_DR_F_VAL)
++ writel( OCR1(PORTF), CONFIG_SYS_OCR1_F_VAL)
++ writel( OCR2(PORTF), CONFIG_SYS_OCR2_F_VAL)
++ writel( ICONFA1(PORTF), CONFIG_SYS_ICFA1_F_VAL)
++ writel( ICONFA2(PORTF), CONFIG_SYS_ICFA2_F_VAL)
++ writel( ICONFB1(PORTF), CONFIG_SYS_ICFB1_F_VAL)
++ writel( ICONFB2(PORTF), CONFIG_SYS_ICFB2_F_VAL)
++ writel( ICR1(PORTF), CONFIG_SYS_ICR1_F_VAL)
++ writel( ICR2(PORTF), CONFIG_SYS_ICR2_F_VAL)
++ writel( IMR(PORTF), CONFIG_SYS_IMR_F_VAL)
++ writel( DDIR(PORTF), CONFIG_SYS_DDIR_F_VAL)
++ writel( GPR(PORTF), CONFIG_SYS_GPR_F_VAL)
++ writel( PUEN(PORTF), CONFIG_SYS_PUEN_F_VAL)
++ writel( GIUS(PORTF), CONFIG_SYS_GIUS_F_VAL)
++.endm /* port_init */
++
++.macro init_aipi
++ /*
++ * setup AIPI1 and AIPI2
++ */
++ writel(AIPI1_PSR0, CONFIG_SYS_AIPI1_PSR0_VAL)
++ writel(AIPI1_PSR1, CONFIG_SYS_AIPI1_PSR1_VAL)
++ writel(AIPI2_PSR0, CONFIG_SYS_AIPI2_PSR0_VAL)
++ writel(AIPI2_PSR1, CONFIG_SYS_AIPI2_PSR1_VAL)
++
++ /* Change SDRAM signal strengh */
++ ldr r0, =GPCR
++ ldr r1, =CONFIG_SYS_GPCR_VAL
++ ldr r5, [r0]
++ orr r5, r5, r1
++ str r5, [r0]
++
++.endm /* init_aipi */
++
++.macro init_clock
++ ldr r0, =CSCR
++ /* disable MPLL/SPLL first */
++ ldr r1, [r0]
++ bic r1, r1, #(CSCR_MPEN|CSCR_SPEN)
++ str r1, [r0]
++
++ /*
++ * pll clock initialization predefined in apf27.h
++ */
++ writel(MPCTL0, CONFIG_SYS_MPCTL0_VAL)
++ writel(SPCTL0, CONFIG_SYS_SPCTL0_VAL)
++
++ writel(CSCR, CONFIG_SYS_CSCR_VAL | CSCR_MPLL_RESTART | CSCR_SPLL_RESTART)
++
++ /*
++ * add some delay here
++ */
++ mov r1, #0x1000
++ 1: subs r1, r1, #0x1
++ bne 1b
++
++ /* peripheral clock divider */
++ writel(PCDR0, CONFIG_SYS_PCDR0_VAL)
++ writel(PCDR1, CONFIG_SYS_PCDR1_VAL)
++
++ /* Configure PCCR0 and PCCR1 */
++ writel(PCCR0, CONFIG_SYS_PCCR0_VAL)
++ writel(PCCR1, CONFIG_SYS_PCCR1_VAL)
++
++
++.endm /* init_clock */
++
++.macro sdram_init
++ /* wait for SDRAM/LPDDR ready (SDRAMRDY) */
++ ldr r0, =ESDMISC
++ ldr r4, =ESDMISC_SDRAM_RDY
++2: ldr r1, [r0]
++ ands r1, r1, r4
++ bpl 2b
++
++ /* LPDDR Soft Reset Mobile/Low Power DDR SDRAM. */
++ ldr r0, =ESDMISC
++ ldr r4, =CONFIG_SYS_ESDMISC_VAL
++ orr r1, r4, #ESDMISC_MDDR_DL_RST
++ str r1, [r0]
++
++ /* Hold for more than 200ns */
++ ldr r1, =0x10000
++ 1: subs r1, r1, #0x1
++ bne 1b
++
++ str r4, [r0]
++
++ writel(ESDCFG0, CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL)
++
++ /* writel(ESDCTL0, CONFIG_SYS_PRECHARGE_CMD) */
++ ldr r0, =ESDCTL0
++ ldr r1, =CONFIG_SYS_PRECHARGE_CMD
++ str r1, [r0]
++
++ /* writeb(0xA0001000, any value) */
++ ldr r1, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldrb r2, [r1]
++
++ /* writel(ESDCTL0, CONFIG_SYS_AUTOREFRESH_CMD) */
++ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
++ str r1, [r0]
++
++ ldr r4, =CONFIG_SYS_SDRAM_1_BASE /* CSD0 base address */
++
++ ldr r6,=0x7 /* load loop counter */
++1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
++ subs r6,r6,#1 /* decrease counter value */
++ bne 1b
++
++ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_SET_MODE_REG_CMD) */
++ ldr r1, =CONFIG_SYS_SET_MODE_REG_CMD
++ str r1, [r0]
++
++ /* set standard mode register */
++ ldr r4, = CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldrb r2, [r4]
++
++ /* set extended mode register */
++ ldr r4, =CONFIG_SYS_SDRAM_1_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldrb r5, [r4]
++
++ /* writel(CONFIG_SYS_PRECHARGE_CMD, CONFIG_SYS_NORMAL_RW_CMD) */
++ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
++ str r1, [r0]
++
++#if (CONFIG_NR_DRAM_BANKS > 1)
++ /* 2nd sdram */
++ writel(ESDCFG1, CONFIG_SYS_SDRAM_ESDCFG_REGISTER_VAL )
++
++ /* writel(ESDCTL1, CONFIG_SYS_PRECHARGE_CMD) */
++ ldr r0, =ESDCTL1
++ ldr r1, =CONFIG_SYS_PRECHARGE_CMD
++ str r1, [r0]
++
++ /* writeb(0xB0001000, any value) */
++ ldr r1, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_PRECHARGE_ALL_VAL
++ ldrb r2, [r1]
++
++ /* writel(ESDCTL1, CONFIG_SYS_AUTOREFRESH_CMD) */
++ ldr r1, =CONFIG_SYS_AUTOREFRESH_CMD
++ str r1, [r0]
++
++ ldr r4, =CONFIG_SYS_SDRAM_2_BASE /* CSD1 base address */
++
++ ldr r6,=0x7 /* load loop counter */
++1: ldr r5,[r4] /* run auto-refresh cycle to array 0 */
++ subs r6,r6,#1 /* decrease counter value */
++ bne 1b
++
++ /* writel(ESDCTL1, CONFIG_SYS_SET_MODE_REG_CMD) */
++ ldr r1, =CONFIG_SYS_SET_MODE_REG_CMD
++ str r1, [r0]
++
++ /* set standard mode register */
++ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_MODE_REGISTER_VAL
++ ldrb r2, [r4]
++
++ /* set extended mode register */
++ ldr r4, =CONFIG_SYS_SDRAM_2_BASE+CONFIG_SYS_SDRAM_EXT_MODE_REGISTER_VAL
++ ldrb r2, [r4]
++
++ /* writel(ESDCTL1, CONFIG_SYS_NORMAL_RW_CMD) */
++ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
++ str r1, [r0]
++#endif /* CONFIG_NR_DRAM_BANKS > 1 */
++.endm /* sdram_init */
++
++.globl board_init_lowlevel
++board_init_lowlevel:
++.globl lowlevel_init
++lowlevel_init:
++
++ mov r10, lr
++
++ init_aipi
++
++ /* configure csx */
++ writel(CS0U, CONFIG_SYS_CS0U_VAL)
++ writel(CS0L, CONFIG_SYS_CS0L_VAL)
++ writel(CS0A, CONFIG_SYS_CS0A_VAL)
++
++ writel(CS1U, CONFIG_SYS_CS1U_VAL)
++ writel(CS1L, CONFIG_SYS_CS1L_VAL)
++ writel(CS1A, CONFIG_SYS_CS1A_VAL)
++
++ writel(CS2U, CONFIG_SYS_CS2U_VAL)
++ writel(CS2L, CONFIG_SYS_CS2L_VAL)
++ writel(CS2A, CONFIG_SYS_CS2A_VAL)
++
++ writel(CS3U, CONFIG_SYS_CS3U_VAL)
++ writel(CS3L, CONFIG_SYS_CS3L_VAL)
++ writel(CS3A, CONFIG_SYS_CS3A_VAL)
++
++ writel(CS4U, CONFIG_SYS_CS4U_VAL)
++ writel(CS4L, CONFIG_SYS_CS4L_VAL)
++ writel(CS4A, CONFIG_SYS_CS4A_VAL)
++
++ writel(CS5U, CONFIG_SYS_CS5U_VAL)
++ writel(CS5L, CONFIG_SYS_CS5L_VAL)
++ writel(CS5A, CONFIG_SYS_CS5A_VAL)
++
++ writel(EIM, CONFIG_SYS_EIM_VAL)
++
++ port_init
++
++ /* Configure FPGA CLKO */
++ writel(CCSR, CONFIG_SYS_CCSR_VAL)
++
++ /* Configure strentgh for FPGA */
++ writel(DSCR10, CONFIG_SYS_DSCR10_VAL)
++ writel(DSCR3, CONFIG_SYS_DSCR3_VAL)
++ writel(DSCR7, CONFIG_SYS_DSCR7_VAL)
++ writel(DSCR2, CONFIG_SYS_DSCR2_VAL)
++
++
++
++ /* skip clock and sdram initialization if we run from ram */
++ cmp pc, #0xa0000000
++ bls 1f
++ cmp pc, #0xc0000000
++ bhi 1f
++
++ mov pc,r10
++1:
++ init_clock
++
++ sdram_init
++
++ mov pc,r10
++
+diff --git a/board/armadeus/apf27/u-boot-nand.lds b/board/armadeus/apf27/u-boot-nand.lds
+new file mode 100644
+index 0000000..f66f20e
+--- /dev/null
++++ b/board/armadeus/apf27/u-boot-nand.lds
+@@ -0,0 +1,56 @@
++/*
++ * (C) Copyright 2007
++ * Wolfgang Denk, DENX Software Engineering, wd...@de....
++ *
++ * 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
++ */
++
++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
++OUTPUT_ARCH(arm)
++ENTRY(_start)
++SECTIONS
++{
++ . = 0x00000000;
++
++ . = ALIGN(4);
++ .text :
++ {
++ cpu/arm926ejs/start.o (.text)
++ *(.text)
++ }
++
++ . = ALIGN(4);
++ .rodata : { *(.rodata) }
++
++ . = ALIGN(4);
++ .data : { *(.data) }
++
++ . = ALIGN(4);
++ .got : { *(.got) }
++
++ __u_boot_cmd_start = .;
++ .u_boot_cmd : { *(.u_boot_cmd) }
++ __u_boot_cmd_end = .;
++
++ . = ALIGN(4);
++ __bss_start = .;
++ .bss : { *(.bss) }
++ _end = .;
++}
++
+diff --git a/boards.cfg b/boards.cfg
+index 66c27a4..f68c3a7 100644
+--- a/boards.cfg
++++ b/boards.cfg
+@@ -69,6 +69,7 @@ integratorcp_cm926ejs arm arm926ejs integrator armltd
+ aspenite arm arm926ejs - Marvell armada100
+ gplugd arm arm926ejs - Marvell armada100
+ afeb9260 arm arm926ejs - - at91
++apf27 arm arm926ejs apf27 armadeus mx27
+ at91sam9260ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS0
+ at91sam9260ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS1
+ at91sam9260ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9260,SYS_USE_NANDFLASH
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch b/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
new file mode 100644
index 0000000..d9ed98d
--- /dev/null
+++ b/patches/u-boot/2011.12/303-Remove-useless-code-in-apf27.patch
@@ -0,0 +1,76 @@
+From 7d5eba120d72f2ea5e3a946fd2c87b021759f21b Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Tue, 4 Oct 2011 19:30:15 +0200
+Subject: [PATCH 3/6] Remove useless code in apf27
+
+---
+ board/armadeus/apf27/apf27.c | 45 ------------------------------------------
+ 1 files changed, 0 insertions(+), 45 deletions(-)
+
+diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
+index e08b7a2..d4f2082 100644
+--- a/board/armadeus/apf27/apf27.c
++++ b/board/armadeus/apf27/apf27.c
+@@ -27,31 +27,6 @@
+
+ DECLARE_GLOBAL_DATA_PTR;
+
+-static int read_firmware (size_t offset, size_t end, u_char * buf)
+-{
+- size_t amount_loaded = 0;
+- size_t blocksize;
+-
+- u_char *char_ptr;
+-
+- blocksize = nand_info[0].erasesize;
+-
+- while (offset < end) {
+- if (nand_block_isbad(&nand_info[0], offset)) {
+- offset += blocksize;
+- } else {
+- char_ptr = &buf[amount_loaded];
+- if (nand_read(&nand_info[0], offset, &blocksize, char_ptr))
+- return 1;
+- offset += blocksize;
+- amount_loaded += blocksize;
+- }
+- }
+-
+- return amount_loaded;
+-}
+-
+-
+ static int apf27_devices_init(void)
+ {
+ int i;
+@@ -141,27 +116,7 @@ int
+ misc_init_r (void)
+ {
+ char *s;
+- u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
+- size_t end = 0;
+- size_t size = 0;
+ size_t offset = -1;
+- char *autoload = getenv ("firmware_autoload");
+-
+-#if defined(CONFIG_FPGA)
+- /* init and download fpga */
+- if (( autoload ) && (0 == strcmp(autoload, "1"))) {
+- if ((s = getenv("firmware_offset")) != NULL) {
+- offset = simple_strtoul(s, NULL, 16);
+- }
+- if ((s = getenv("firmware_len")) != NULL) {
+- end = offset + simple_strtoul(s, NULL, 16);
+- }
+- if ((-1 != offset) && (offset != end)) {
+- size = read_firmware (offset, end, firmware_buffer);
+- }
+- }
+- APF27_init_fpga (firmware_buffer, size);
+-#endif
+
+ /* detect compatibility issue of environment version */
+ s = getenv ("env_version");
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/304-Add-type-for-apf27.patch b/patches/u-boot/2011.12/304-Add-type-for-apf27.patch
new file mode 100644
index 0000000..29628c7
--- /dev/null
+++ b/patches/u-boot/2011.12/304-Add-type-for-apf27.patch
@@ -0,0 +1,24 @@
+From bfedc74f6beae4f7bbb5f2ccf0c651a489fe7675 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Wed, 28 Dec 2011 14:26:52 +0100
+Subject: [PATCH 4/6] Add type for apf27
+
+---
+ arch/arm/include/asm/mach-types.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
+index 2d5c3bc..c38a816 100644
+--- a/arch/arm/include/asm/mach-types.h
++++ b/arch/arm/include/asm/mach-types.h
+@@ -286,6 +286,7 @@ extern unsigned int __machine_arch_type;
+ #define MACH_TYPE_WBD111 1690
+ #define MACH_TYPE_MV2120 1693
+ #define MACH_TYPE_MX51_3DS 1696
++#define MACH_TYPE_APF27 1698
+ #define MACH_TYPE_IMX27LITE 1701
+ #define MACH_TYPE_USB_A9260 1709
+ #define MACH_TYPE_USB_A9263 1710
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch b/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
new file mode 100644
index 0000000..7f00497
--- /dev/null
+++ b/patches/u-boot/2011.12/305-Define-uart1-for-the-console.patch
@@ -0,0 +1,24 @@
+From 434d5acde85c1277d3ff32597a56e50304fd4081 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Wed, 28 Dec 2011 14:27:48 +0100
+Subject: [PATCH 5/6] Define uart1 for the console
+
+---
+ include/configs/apf27.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/include/configs/apf27.h b/include/configs/apf27.h
+index f1602a0..48c73bb 100644
+--- a/include/configs/apf27.h
++++ b/include/configs/apf27.h
+@@ -66,6 +66,7 @@
+ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
+ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+ #define CONFIG_BAUDRATE 115200
++#define CONFIG_MXC_UART_BASE UART1_BASE
+
+ /*
+ * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
new file mode 100644
index 0000000..5746cda
--- /dev/null
+++ b/patches/u-boot/2011.12/306-Debug-nand-this-patch-should-be-removed.patch
@@ -0,0 +1,150 @@
+From 8aa4ee39d003d442cc9f01ea487dcce190274cfc Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@ya...>
+Date: Wed, 25 Jan 2012 20:36:42 +0100
+Subject: [PATCH 6/6] Debug nand, this patch should be removed
+
+---
+ drivers/mtd/nand/mxc_nand.c | 22 +++++++++++++++++++++-
+ drivers/mtd/nand/nand_base.c | 2 ++
+ include/configs/apf27.h | 16 ++++++++--------
+ 3 files changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
+index 35e89a0..929e228 100644
+--- a/drivers/mtd/nand/mxc_nand.c
++++ b/drivers/mtd/nand/mxc_nand.c
+@@ -193,7 +193,8 @@ static struct mxc_nand_host mxc_host;
+ static struct mxc_nand_host *host = &mxc_host;
+
+ /* Define delays in microsec for NAND device operations */
+-#define TROP_US_DELAY 2000
++#define TROP_US_DELAY 10000
++
+ /* Macros to get byte and bit positions of ECC */
+ #define COLPOS(x) ((x) >> 3)
+ #define BITPOS(x) ((x) & 0xf)
+@@ -326,6 +327,21 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd)
+ {
+ MTDDEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x)\n", cmd);
+
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: bufsize = 0x%04x\n", __func__, readw(&host->regs->nfc_buf_size));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_buf_addr = 0x%04x\n", __func__, readw(&host->regs->nfc_buf_addr));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_flash_addr = 0x%04x\n", __func__, readw(&host->regs->nfc_flash_addr));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_flash_cmd = 0x%04x\n", __func__, readw(&host->regs->nfc_flash_cmd));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_config = 0x%04x\n", __func__, readw(&host->regs->nfc_config));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_ecc_status_result = 0x%04x\n", __func__, readw(&host->regs->nfc_ecc_status_result));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_rsltmain_area = 0x%04x\n", __func__, readw(&host->regs->nfc_rsltmain_area));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_rsltspare_area = 0x%04x\n", __func__, readw(&host->regs->nfc_rsltspare_area));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_wrprot = 0x%04x\n", __func__, readw(&host->regs->nfc_wrprot));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_unlockstart_blkaddr = 0x%04x\n", __func__, readw(&host->regs->nfc_unlockstart_blkaddr));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_unlockend_blkaddr = 0x%04x\n", __func__, readw(&host->regs->nfc_unlockend_blkaddr));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: nfc_nf_wrprst = 0x%04x\n", __func__, readw(&host->regs->nfc_nf_wrprst));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: config1 = 0x%04x\n", __func__, readw(&host->regs->nfc_config1));
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: config2 = 0x%04x\n", __func__, readw(&host->regs->nfc_config2));
++
+ writew(cmd, &host->regs->nfc_flash_cmd);
+ writew(NFC_CMD, &host->regs->nfc_config2);
+
+@@ -1308,6 +1324,8 @@ int board_nand_init(struct nand_chip *this)
+ uint16_t tmp;
+ int err = 0;
+
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s(this = %p)\n", __func__, this);
++
+ /* structures must be linked */
+ mtd = &host->mtd;
+ mtd->priv = this;
+@@ -1391,6 +1409,8 @@ int board_nand_init(struct nand_chip *this)
+ if (is_16bit_nand())
+ this->options |= NAND_BUSWIDTH_16;
+
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: this->options = %x\n", __func__, this->options);
++
+ #ifdef CONFIG_SYS_NAND_LARGEPAGE
+ host->pagesize_2k = 1;
+ this->ecc.layout = &nand_hw_eccoob2k;
+diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
+index 27f6c77..6107b8b 100644
+--- a/drivers/mtd/nand/nand_base.c
++++ b/drivers/mtd/nand/nand_base.c
+@@ -2578,6 +2578,8 @@ static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+ tmp_manf = chip->read_byte(mtd);
+ tmp_id = chip->read_byte(mtd);
+
++ MTDDEBUG(MTD_DEBUG_LEVEL1, "%s: manf = %02x, id = %02x\n", __func__, tmp_manf, tmp_id);
++
+ if (tmp_manf != *maf_id || tmp_id != *dev_id) {
+ printk(KERN_INFO "%s: second ID read did not match "
+ "%02x,%02x against %02x,%02x\n", __func__,
+diff --git a/include/configs/apf27.h b/include/configs/apf27.h
+index 48c73bb..162bced 100644
+--- a/include/configs/apf27.h
++++ b/include/configs/apf27.h
+@@ -80,7 +80,7 @@
+ #define CONFIG_CMD_BSP /* Board Specific functions */
+ #define CONFIG_CMD_CACHE /* icache, dcache */
+ #define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
+-//#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
++// #define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+ #define CONFIG_CMD_DHCP /* DHCP Support */
+ #define CONFIG_CMD_DIAG /* Diagnostics */
+ //#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
+@@ -358,7 +358,7 @@
+ /*
+ * SDRAM definition parameter
+ */
+-#define CONFIG_NR_DRAM_BANKS 1
++#define CONFIG_NR_DRAM_BANKS 2
+
+ #define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
+
+@@ -552,8 +552,8 @@
+ //#define CONFIG_MTD_NAND_VERIFY_WRITE 1
+ //#define CONFIG_SYS_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
+ //#define CONFIG_SYS_NFC_DEBUG
+-//#define CONFIG_MTD_DEBUG
+-//#define CONFIG_MTD_DEBUG_VERBOSE 3
++#define CONFIG_MTD_DEBUG
++#define CONFIG_MTD_DEBUG_VERBOSE 3
+
+ /*=====================*/
+
+@@ -787,7 +787,7 @@
+ #define CONFIG_SYS_OCR2_B_VAL 0x00000000
+ #define CONFIG_SYS_ICFA1_B_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_ICFA2_B_VAL 0xFFFFFFFF
+-#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
++#define CONFIG_SYS_ICFB1_B_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_ICFB2_B_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_DR_B_VAL 0x00000000
+ #define CONFIG_SYS_GIUS_B_VAL 0xFF3FFFF0
+@@ -805,7 +805,7 @@
+ #define CONFIG_SYS_ICFB1_C_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_ICFB2_C_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_DR_C_VAL 0x00000000
+-#define CONFIG_SYS_GIUS_C_VAL 0xFFFFFFFF
++#define CONFIG_SYS_GIUS_C_VAL 0xFFFFC07F
+ #define CONFIG_SYS_ICR1_C_VAL 0x00000000
+ #define CONFIG_SYS_ICR2_C_VAL 0x00000000
+ #define CONFIG_SYS_IMR_C_VAL 0x00000000
+@@ -835,7 +835,7 @@
+ #define CONFIG_SYS_ICFB1_E_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_ICFB2_E_VAL 0xFFFFFFFF
+ #define CONFIG_SYS_DR_E_VAL 0x00000000
+-#define CONFIG_SYS_GIUS_E_VAL 0xFFFFCCF8
++#define CONFIG_SYS_GIUS_E_VAL 0xFCFFCCF8
+ #define CONFIG_SYS_ICR1_E_VAL 0x00000000
+ #define CONFIG_SYS_ICR2_E_VAL 0x00000000
+ #define CONFIG_SYS_IMR_E_VAL 0x00000000
+@@ -880,7 +880,7 @@
+ #define CONFIG_SYS_AIPI2_PSR1_VAL 0xFFFFFFFF
+
+ /* PCCR enable DMA FEC I2C1 IIM SDHC1 */
+-#define CONFIG_SYS_PCCR0_VAL 0x05070410
++#define CONFIG_SYS_PCCR0_VAL 0x05070400
+ #define CONFIG_SYS_PCCR1_VAL 0xA14A0408
+
+ /* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
+--
+1.7.4.4
+
diff --git a/patches/u-boot/2011.12/310-apf27-nand-spl.patch b/patches/u-boot/2011.12/310-apf27-nand-spl.patch
new file mode 100644
index 0000000..db09282
--- /dev/null
+++ b/patches/u-boot/2011.12/310-apf27-nand-spl.patch
@@ -0,0 +1,721 @@
+Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/config.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2010.03/nand_spl/board/armadeus/apf27/config.mk 2011-01-05 18:09:44.000000000 +0100
+@@ -0,0 +1,43 @@
++#
++# (C) Copyright 2007
++# Stefan Roese, DENX Software Engineering, sr...@de....
++#
++# 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
++#
++#
++# This config file is used for compilation of armadeus apf27 board
++#
++
++#
++# TEXT_BASE for SPL:
++#
++#
++# This config file is used for compilation of armadeus sources
++#
++# You might change location of U-Boot in memory by setting right TEXT_BASE.
++# This allows for example having one copy located at the end of ram and stored
++# in flash device and later on while developing use other location to test
++# the code in RAM device only.
++#
++
++TEXT_BASE = 0xa0000000
++
++# PAD_TO used to generate a 2kByte binary needed for the combined image
++# -> PAD_TO = TEXT_BASE + 0x0800
++PAD_TO = 0xa0000800
+Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2010.03/nand_spl/board/armadeus/apf27/Makefile 2011-01-05 18:09:44.000000000 +0100
+@@ -0,0 +1,77 @@
++#
++# (C) Copyright 2007
++# Stefan Roese, DENX Software Engineering, sr...@de....
++#
++# 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 $(TOPDIR)/config.mk
++include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
++
++LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
++LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
++AFLAGS += -DCONFIG_NAND_SPL
++CFLAGS += -DCONFIG_NAND_SPL
++
++SOBJS = start.o
++COBJS =
++
++SRCS := $(addprefix $(src),$(SOBJS:.o=.S) $(COBJS:.o=.c))
++OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
++__OBJS := $(SOBJS) $(COBJS)
++LNDIR := $(OBJTREE)/nand_spl/board/$(BOARDDIR)
++
++nandobj := $(OBJTREE)/nand_spl/
++
++ALL = $(nandobj)u-boot-spl $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin \
++ $(nandobj)System.map
++
++all: $(obj).depend $(ALL)
++
++$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
++ $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@
++
++$(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl
++ $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
++
++$(nandobj)u-boot-spl: $(OBJS)
++ cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
++ -Map $(nandobj)u-boot-spl.map \
++ -o $(nandobj)u-boot-spl
++
++$(nandobj)System.map: $(nandobj)u-boot-spl
++ @$(NM) $< | \
++ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
++ sort > $(nandobj)System.map
++
++
++#########################################################################
++
++$(obj)%.o: %.S
++ $(CC) $(AFLAGS) -c -o $@ $<
++
++$(obj)%.o: %.c
++ $(CC) $(CFLAGS) -c -o $@ $<
++
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
++
++sinclude $(obj).depend
++
++#########################################################################
+Index: u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2010.03/nand_spl/board/armadeus/apf27/start.S 2011-01-05 18:09:44.000000000 +0100
+@@ -0,0 +1,544 @@
++/*
++ * IMX27 NAND Flash SPL (Secondary Program Loader)
++ *
++ * Copyright (c) 2008 Armadeus Project / eja
++ *
++ * Based on Freescale NAND SPL
++ *
++ * Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
++ * Copyright (c) 2008 Eric Jarrige <eri...@ar...>
++ *
++ * 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 <config.h>
++#include <version.h>
++#include <asm/arch/imx-regs.h>
++
++/*
++ * Standard NAND flash commands
++ */
++#define NAND_CMD_READ0 0
++#define NAND_CMD_READ1 1
++#define NAND_CMD_PAGEPROG 0x10
++#define NAND_CMD_READOOB 0x50
++#define NAND_CMD_ERASE1 0x60
++#define NAND_CMD_STATUS 0x70
++#define NAND_CMD_STATUS_MULTI 0x71
++#define NAND_CMD_SEQIN 0x80
++#define NAND_CMD_READID 0x90
++#define NAND_CMD_ERASE2 0xd0
++#define NAND_CMD_RESET 0xff
++
++/* Extended commands for large page devices */
++#define NAND_CMD_READSTART 0x30
++#define NAND_CMD_CACHEDPROG 0x15
++
++/* Status bits */
++#define NAND_STATUS_FAIL 0x01
++#define NAND_STATUS_FAIL_N1 0x02
++#define NAND_STATUS_TRUE_READY 0x20
++#define NAND_STATUS_READY 0x40
++#define NAND_STATUS_WP 0x80
++
++#define writel(reg, val) \
++ ldr r0, =reg; \
++ ldr r1, =val; \
++ str r1, [r0];
++
++ .macro nand_boot
++
++#ifdef CONFIG_BOOT_TRACE_REG
++/*
++ * If CONFIG_BOOT_TRACE_REG is a SDRAM address then be sure to use the following
++ * 2 command after SDRAM init
++ */
++
++/* Backup state of previous boot to CONFIG_BOOT_TRACE_REG+4*/
++#define BACKUP_TRACE() \
++ ldr r4, =CONFIG_BOOT_TRACE_REG; \
++ ldr r3, [r4]; \
++ str r3, [r4, #0x04];
++
++/* Save a state of boot at CONFIG_BOOT_TRACE_REG */
++#define BOOT_TRACE(val) \
++ ldr r4, =CONFIG_BOOT_TRACE_REG; \
++ ldr r3, =val; \
++ str r3, [r4];
++#else
++#define BACKUP_TRACE()
++#define BOOT_TRACE(val)
++#endif
++
++nand_boot_setup:
++
++ /* Copy SPL image from flash to SDRAM first */
++ BOOT_TRACE(1)
++ ldr r0, =IMX_NFC_MAIN_AREA0
++ add r2, r0, #(IMX_NFC_SPARE_AREA0-IMX_NFC_MAIN_AREA0) //2KB NFC Buff
++ ldr r1, =CONFIG_SYS_NAND_U_BOOT_DST
++
++ BOOT_TRACE(2)
++1: ldmia r0!, {r3-r10}
++ stmia r1!, {r3-r10}
++ cmp r0, r2
++ blo 1b
++
++
++
++ /* Jump to SDRAM */
++ BOOT_TRACE(3)
++ ldr r1, =0xFFF
++ and r0, pc, r1 /* offset of pc */
++ ldr r1, =CONFIG_SYS_NAND_U_BOOT_DST
++ add r1, r1, #0x10
++ add pc, r0, r1
++ nop
++ nop
++ nop
++ nop
++
++NAND_Copy_Main:
++ BOOT_TRACE(4)
++ /* r0: nfc base. Reloaded after each page copying */
++ ldr r0, =IMX_NFC_MAIN_AREA0
++
++ /* r1: starting flash addr to be copied. Updated constantly */
++ /* bypass the first preloaded pages */
++ ldr r1, =(IMX_NFC_SPARE_AREA0-IMX_NFC_MAIN_AREA0)
++
++ /* r2: end of 1st RAM buf. Doesn't change */
++ ldr r2, =IMX_NFC_MAIN_AREA1
++
++ /* r12: NFC register base. Doesn't change */
++ ldr r12, =IMX_NFC_REGS
++
++ ldr r11, =CONFIG_SYS_NAND_U_BOOT_DST
++
++ /* r13: end of SDRAM address for copying. Doesn't change */
++ add r13, r11, #CONFIG_SYS_NAND_U_BOOT_SIZE
++
++ /* r11: starting SDRAM address for copying. Updated constantly */
++ add r11, r11, r1
++
++ /* unlock internal buffer */
++ ldr r3, =NFC_CONFIG_UNLOCKED
++ strh r3, [r12, #NFC_OFFSET_CONFIG]
++
++ /* enable ECC and mask interrupts */
++ ldr r3, =(NFC_CONFIG1_ECC_EN | NFC_CONFIG1_INT_MSK)
++ strh r3, [r12, #NFC_OFFSET_CONFIG1]
++
++Nfc_Read_Page:
++ BOOT_TRACE(5)
++ /* send NAND_CMD_READ0 command */
++ ldr r3, =NAND_CMD_READ0;
++ strh r3, [r12, #NFC_OFFSET_FLASH_CMD]
++
++ ldr r3, =NFC_CONFIG2_FCMD
++ strh r3, [r12, #NFC_OFFSET_CONFIG2]
++ bl do_wait_op_done
++
++ /* send NAND address to read. TODO small page support */
++ BOOT_TRACE(6)
++ mov r3, r1, lsr #1
++ bl do_addr_input /* 1st addr cycle */
++
++ mov r3, r1, lsr #9
++ and r3, r3, #0x03
++ bl do_addr_input /* 2nd addr cycle */
++
++ mov r3, r1, lsr #11
++ bl do_addr_input /* 3rd addr cycle */
++
++ mov r3, r1, lsr #19
++ bl do_addr_input /* 4th addr cycle */
++
++ /* Small NAND flashs ...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2012-02-13 16:11:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 50d319fed0e399971bef3267b1e339def413e49e (commit)
via 7886c80b7aa364d0875d113f8d640b2884fe045c (commit)
from 3069d4accd17f29b2a210594e6020491065ad0cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 50d319fed0e399971bef3267b1e339def413e49e
Merge: 7886c80 3069d4a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 13 17:10:50 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7886c80b7aa364d0875d113f8d640b2884fe045c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 13 17:10:23 2012 +0100
[BUILDROOT] gsmmux: also handles sagem's custom version and move package to right menuconfig place
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2011.05/172-gsmmux-add_package.patch | 53 ++++++++++++++------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/patches/buildroot/2011.05/172-gsmmux-add_package.patch b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
index 8f24112..2b400cd 100644
--- a/patches/buildroot/2011.05/172-gsmmux-add_package.patch
+++ b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
@@ -4,18 +4,25 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gsmmux/gsmmux.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gsmmux/gsmmux.mk 2012-02-06 15:51:44.000000000 +0100
-@@ -0,0 +1,31 @@
++++ buildroot/package/gsmmux/gsmmux.mk 2012-02-13 14:22:57.000000000 +0100
+@@ -0,0 +1,38 @@
+#############################################################
+#
+# gsmmux
+#
+#############################################################
+
++GSMMUX_BINARY = gsmMuxd
++ifeq ($(BR2_PACKAGE_GSMMUX_GENERIC),y)
+GSMMUX_VERSION = 18
+GSMMUX_SITE = http://svn.berlios.de/svnroot/repos/gsmmux/trunk
+GSMMUX_SITE_METHOD = svn
-+GSMMUX_BINARY = gsmMuxd
++GSMMUX_BUILD_BINARY = build/$(GSMMUX_BINARY)
++else
++GSMMUX_VERSION = sagem
++GSMMUX_SITE = ftp://ftp2.armadeus.com/armadeusw/downloads
++GSMMUX_BUILD_BINARY = $(GSMMUX_BINARY)
++endif
+GSMMUX_TARGET_DIR = $(TARGET_DIR)/usr/bin
+
+define GSMMUX_BUILD_CMDS
@@ -25,7 +32,7 @@ Index: buildroot/package/gsmmux/gsmmux.mk
+endef
+
+define GSMMUX_INSTALL_TARGET_CMDS
-+ cp $(@D)/build/$(GSMMUX_BINARY) $(GSMMUX_TARGET_DIR)
++ cp $(@D)/$(GSMMUX_BUILD_BINARY) $(GSMMUX_TARGET_DIR)
+endef
+
+define GSMMUX_CLEAN_CMDS
@@ -39,21 +46,21 @@ Index: buildroot/package/gsmmux/gsmmux.mk
+$(eval $(call GENTARGETS,package,gsmmux))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-06 15:45:15.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-06 15:45:58.000000000 +0100
-@@ -338,6 +338,7 @@
- #endif
-
- menu "Networking"
+--- buildroot.orig/package/Config.in 2012-02-13 13:56:47.000000000 +0100
++++ buildroot/package/Config.in 2012-02-13 14:21:59.000000000 +0100
+@@ -191,6 +191,7 @@
+ source "package/genromfs/Config.in"
+ source "package/gpm/Config.in"
+ source "package/gpsd/Config.in"
+source "package/gsmmux/Config.in"
- source "package/libcanfestival/Config.in"
- source "package/libcgi/Config.in"
- source "package/libcgicc/Config.in"
+ source "package/gvfs/Config.in"
+ source "package/hal/Config.in"
+ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
Index: buildroot/package/gsmmux/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gsmmux/Config.in 2012-02-06 15:45:08.000000000 +0100
-@@ -0,0 +1,9 @@
++++ buildroot/package/gsmmux/Config.in 2012-02-13 14:20:00.000000000 +0100
+@@ -0,0 +1,25 @@
+config BR2_PACKAGE_GSMMUX
+ bool "gsmmux"
+ help
@@ -63,3 +70,19 @@ Index: buildroot/package/gsmmux/Config.in
+ channel to the modem.
+
+ http://developer.berlios.de/projects/gsmmux/
++
++if BR2_PACKAGE_GSMMUX
++
++choice
++ prompt "Version to use"
++ default BR2_PACKAGE_GSMMUX_SAGEM
++
++config BR2_PACKAGE_GSMMUX_GENERIC
++ bool "generic"
++
++config BR2_PACKAGE_GSMMUX_SAGEM
++ bool "sagem"
++
++endchoice
++
++endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-12 23:52:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3069d4accd17f29b2a210594e6020491065ad0cc (commit)
from e09bbaa83698e97f7755564d5382106703888a37 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3069d4accd17f29b2a210594e6020491065ad0cc
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 00:51:54 2012 +0100
[UBOOT] update u-boot_recover to restore boards through USB link only - do not need Ethernet anymore to recover UBoot
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf28-u-boot-spl | Bin 0 -> 193422 bytes
software/uboot_recover/apf28-u-boot.sb | Bin 407136 -> 410112 bytes
software/uboot_recover/apf28-u-boot_recover.bd | 20 ++
software/uboot_recover/apf28_recover.py | 342 ++++++------------------
4 files changed, 102 insertions(+), 260 deletions(-)
create mode 100755 software/uboot_recover/apf28-u-boot-spl
create mode 100644 software/uboot_recover/apf28-u-boot_recover.bd
diff --git a/software/uboot_recover/apf28-u-boot-spl b/software/uboot_recover/apf28-u-boot-spl
new file mode 100755
index 0000000..22f34e5
Binary files /dev/null and b/software/uboot_recover/apf28-u-boot-spl differ
diff --git a/software/uboot_recover/apf28-u-boot.sb b/software/uboot_recover/apf28-u-boot.sb
index 2240fe6..4fefc54 100644
Binary files a/software/uboot_recover/apf28-u-boot.sb and b/software/uboot_recover/apf28-u-boot.sb differ
diff --git a/software/uboot_recover/apf28-u-boot_recover.bd b/software/uboot_recover/apf28-u-boot_recover.bd
new file mode 100644
index 0000000..4d53b25
--- /dev/null
+++ b/software/uboot_recover/apf28-u-boot_recover.bd
@@ -0,0 +1,20 @@
+sources {
+ u_boot_spl="apf28-u-boot-spl";
+ u_boot_env="apf28_env_recover.txt";
+ u_boot_sb="apf28-u-boot.sb";
+}
+
+section (0) {
+ //----------------------------------------------------------
+ // SPL Initialization: power supply & DDR2 memory
+ //----------------------------------------------------------
+ load u_boot_spl;
+ load ivt (entry = u_boot_spl:board_init_ll) > 0x8000;
+ hab call 0x8000;
+
+ //----------------------------------------------------------
+ // Load U-Boot and env script to setup NAND flash
+ //----------------------------------------------------------
+ load u_boot_sb > 0x40000000;
+ load u_boot_env > 0x41000100;
+}
diff --git a/software/uboot_recover/apf28_recover.py b/software/uboot_recover/apf28_recover.py
index 65750b7..a90c53b 100644
--- a/software/uboot_recover/apf28_recover.py
+++ b/software/uboot_recover/apf28_recover.py
@@ -63,230 +63,6 @@ class Error(Exception):
return self.level
-class apf28Bootloader:
-
- statuscode = { 0x8D: 'data specified is out of bounds',
- 0x55: 'error during assert verification',
- 0x36: 'hash verification failed',
- 0x33: 'certificate parsing failed or the certificate contained an unsupported key',
- 0x35: 'signature verification failed',
- 0x47: 'Super-Root key installation failed',
- 0x39: 'Failure not matching any other description',
- 0x4B: 'CSF command sequence contains unsupported command identifier',
- 0x4E: 'absence of expected CSF header',
- 0x4D: 'CSF length is unsupported',
- 0x2E: 'CSF TYPE does not match processor TYPE',
- 0x2D: 'CSF UID does not match either processor UID or generic UID',
- 0x3A: 'CSF customer/product code does not match processor customer/product code',
- 0x87: 'key indexis either unsupported, or an attempt is made to overwrite the SRK from a CSF command',
- 0xF0: 'successful operation completion',
- 0x17: 'SCC unexpectedly not in secure state',
- 0x1E: 'secureRAM secret key invalid',
- 0x1D: 'secureRAM initialization failure',
- 0x1B: 'secureRAM self test failure',
- 0x2B: 'secureRAM internal failure',
- 0x27: 'secureRAM secrect key unexpectedly in use',
- 0x3C: 'SAHARA failure',
- 0x59: 'SAHARA/SCC connectivity failure',
- 0xA3: 'All RTIC regions are allocated',
- 0x93: 'RTIC/SCC connectivity failure',
- 0x0F: 'SHW is not enabled',
- 0x8B: 'an attempt is made to read a key from the list of subordinate public keys at a location where no key is installed',
- 0x8E: 'algorithm type is either invalid or ortherwise unsupported',
- 0x66: 'write operation to register failed',
- 0x88: 'Successful download completion' }
-
- def __init__(self, serialDevice):
- self.serdev = serialDevice
-
- def getStatus(self):
- self.serdev.flushInput()
- self.serdev.write(self.buildcmd("0505", "00000000", "l", "00000000", "00000000", "0"))
- result = self.serdev.read(4)
- if len(result) > 0:
- try:
- if self.serdev.port == 'USB':
- status = result[0]
- else:
- status = ord(result[0])
-
- print "Status: %s" % self.statuscode[status]
- #for i in range(len(result)):
- # print '%02x' % result[i],
- except KeyError,e:
- print "Unknown status " + str(status)
- else:
- print '\nTimeout while asking for status'
-
- def __displayProgress(self, text):
- sys.stdout.write(chr(13))
- print text,
- sys.stdout.flush()
-
- def get(self, addr, count, mode):
- """
- addr: address to read
- count: number of bytes to read
- mode: b, w, l for byte, word, long
- """
- assert len(addr) <= 8, 'address too long'
- assert int(count,16) > 0, 'zero length get'
- assert int(count,16) < 0xffffffff, 'Too long get, should be < 31 bytes'
- self.serdev.write(self.buildcmd("0101" ,addr, mode, count.zfill(9-len(count)), "00000000", "0"))
-
- #nbbyte = 1
- #if mode == 'w':
- # nbbyte = 2
- #if mode == 'l':
- # nbbyte = 4
-
- #nbbyte = nbbyte * int(count)
- temp = self.serdev.read(int(count)+4) # read n+4 char
- if len(temp) == 0:
- print 'read timeout'
- return
- #print '\nread ACK:',
- #for i in range (len(temp)):
- # print '%02x' % ord(temp[i]),
-
- #print 'read data:',
- result = []
- for i in range (4,len(temp)):
-
- result += '%02x' % ord(temp[len(temp)-i+3]),
- print ''.join(result)
- return ''.join(result)
-
- def put(self, addr, data, mode):
- """
- addr: address where the data have to be written
- data: data to write. must match the given mode
- mode: b, w, l for byte, word, long
- """
- assert len(data) > 0, 'zero length put'
- assert len(addr) == 8, 'address too long'
- self.serdev.write(self.buildcmd("0202", addr,mode, "00000000", data, "0"))
- result = self.serdev.read(4) #ack
- if len(result) == 0:
- print 'read timeout'
- return
- #print ' \nwrite ACK:',
- # for i in range (len(result)):
- # print '%02x' % ord(result[i]),
-
- result = self.serdev.read(4)
- if len(result) == 0:
- print 'read timeout'
- return
-
- #print '\nwrite success:',
- #for i in range (len(result)):
- #print '%02x' % ord(result[i]),
-
- def download(self, addr, data, size, type):
- assert size > 0, 'file empty'
- f = open(data, 'rb')
- self.serdev.write(self.buildcmd("0404", addr, "x", size, "00000000", type))
- result = self.serdev.read(4) #ack
- if len(result) == 0:
- print '\nread timeout'
- return
-
- data = f.read(16)
- count = int(size,16)
- oldcount = count
- total = 0
- b = 0
- print '\nTransfering:'
- while count >= 0: #len(data):
- n = len(data)
- b = 16-n # ensure always 4 bytes
- #tr = unpack('B'*n,data)
- self.serdev.write(data)
- count = count - 16
- if count < 16:
- total = total + count
- else:
- total = total + 16
- if (oldcount - count) >= 4096:
- self.__displayProgress("%06d bytes" % total)
- oldcount = count
- data = f.read(16)
- self.__displayProgress("%d bytes transfered" % total)
- print ""
- f.close()
- return
-
- def buildcmd(self, cmd, addr, ds, cnt, data, ft):
- if ds == 'b':
- datatmp = ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int(data[0:2],16))
- datasize = "08"
- elif ds == 'w':
- datasize = "10"
- datatmp = ('%c' % int('00',16)) + ('%c' % int('00',16)) + ('%c' % int(data[0:2],16)) + ('%c' % int(data[2:4],16))
- elif ds == 'l':
- datasize = "20"
- datatmp = ('%c' % int(data[0:2],16)) + ('%c' % int(data[2:4],16)) + ('%c' % int(data[4:6],16)) + ('%c' % int(data[6:8],16))
- else:
- datasize = "00"
- datatmp = ('%c' % int(data[0:2],16)) + ('%c' % int(data[2:4],16)) + ('%c' % int(data[4:6],16)) + ('%c' % int(data[6:8],16))
-
- result = ('%c' % int(cmd[0:2],16)) + ('%c' % int(cmd[2:4],16)) + \
- ('%c' % int(addr[0:2],16)) + ('%c' % int(addr[2:4],16)) + ('%c' % int(addr[4:6],16)) + ('%c' % int(addr[6:8],16)) + \
- ('%c' % int(datasize,16)) + \
- ('%c' % int(cnt[0:2],16)) + ('%c' % int(cnt[2:4],16)) + ('%c' % int(cnt[4:6],16)) + ('%c' % int(cnt[6:8],16)) + \
- datatmp + ('%c' % int(ft,16))
-
- # for i in range(len(result)):
- # print '%02x' % ord(result[i]),
- #print cnt
- return result
-
-
- def consoleDump(tid):
- while 1:
- sys.stdout.write(tid.read(1))
- # print '%s' % tid.read(1),
-
-
-class USBDevice:
- """
- """
- def __init__(self, idVendor=0x15a2, idProduct=0x0041):
- # find our device
- dev = self.findDevice(idVendor, idProduct)
- # was it found?
- if dev is None:
- raise ValueError('MX28 not found')
- self.__dev = dev
-
- handle = dev.open()
- handle.setConfiguration(1) # choose the first configuration
- handle.claimInterface(0) # choose the first interface
- print('Found i.MX28')
-
- self.__devhandle = handle
- self.__epBulkIn = 0x82
- self.__epBulkOut = 1
- self.port = 'USB'
-
- def findDevice(self, idVendor, idProduct):
- """Find a USB device by product and vendor id."""
- for bus in usb.busses():
- for device in bus.devices:
- if device.idVendor == idVendor and device.idProduct == idProduct:
- return device
- return None
-
- def read(self, length):
- data = self.__devhandle.bulkRead(self.__epBulkIn, length, 100)
- return data
-
- def write(self, data):
- self.__devhandle.bulkWrite(self.__epBulkOut, data, 100)
-
- def flushInput(self):
- pass
class UBoot:
@@ -297,42 +73,60 @@ class UBoot:
def __getOutput(self, error_msg=None):
""" This function waits for U-Boot answer and returns it"""
- #debugser = serial.Serial("/dev/tty0",115200,timeout=1)
response = ""
while not re.search(r'BIOS>', response):
char = self.serial.read(1)
if char == '':
- raise Error(response)
+ print "serial timeout"
+ raise response
response = response + char
if error_msg!=None:
if re.search(error_msg,response):
raise Error("getOutput error")
-
sys.stdout.write(response)
- #debugser.write(char)
- #debugser.close()
return response
def resetEnv(self):
self.serial.write("run flash_reset_env\n")
return self.__getOutput()
+ def importEnv(self, addr, size):
+ self.serial.write("env import -t %08x %08x\n" % (addr, size))
+ return self.__getOutput()
+
def waitForPrompt(self):
time.sleep(1)
self.serial.write("\n")
- return self.__getOutput()
+ ret = self.__getOutput()
+ self.serial.flushInput()
+ return ret
def flash(self):
""" Ask U-Boot to flash itself """
- self.serial.write("run update_uboot\n")
+ time.sleep(1)
+ self.serial.flushInput()
+ self.serial.write("run flash_uboot\n")
try:
ret = self.__getOutput()
+ print ret
except Error,e:
raise Error("Flashing U-Boot")
if not re.search(r'uboot succeed',ret):
print ret
raise Error("U-Boot flash failed",0)
return ret
+
+ def reset(self):
+ """ Ask U-Boot to flash itself """
+ time.sleep(1)
+ self.serial.flushInput()
+ self.serial.write("reset\n")
+ try:
+ ret = self.__getOutput()
+ print ret
+ except Error,e:
+ raise Error("Reseting U-Boot")
+ return ret
if __name__ == "__main__":
@@ -340,6 +134,10 @@ if __name__ == "__main__":
SPEED = 115200
BINARY = "apf28-u-boot.sb"
USB_DOWNLOAD_APP = "../../buildroot/output/host/usr/bin/gnet-imx28-usb-downloader"
+ ELFTOSB_APP = "../../buildroot/output/host/usr/bin/elftosb"
+ NAND_BINARY = "apf28_nand_recover.sb"
+ ENV_RECOVER = "apf28_env_recover.txt"
+ ENV_DOWNLOAD = 0x41000100
print "\n--- APF28 Bootstrap Tool ---\n"
print "Procedure to follow:"
@@ -348,11 +146,8 @@ if __name__ == "__main__":
print "3] Power on your board"
print "4] Connect a USB cable from your PC to the APF28Dev OTG miniUSB connector"
print "5] Connect a USB cable from your PC to the APF28Dev console miniUSB connector"
- print "6] Connect an Ethernet cable (it is a temporary requirement for the current version)"
- print "7] Be sure to have a %s image in current dir too)" % BINARY
- print "8] Be sure to have built the APF28 BSP: make apf28_defconfig; make"
- print "9] Be sure to have installed apf28-u-boot.bin in your /tftpboot/"
- print "10] Have launched this script as root (sudo)\n"
+ print "6] Be sure to have built the APF28 BSP: make apf28_defconfig; make"
+ print "7] Have launched this script as root (sudo)\n"
port = raw_input('--- Enter serial port number or device name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
if port is '':
port = '/dev/ttyACM0'
@@ -360,51 +155,78 @@ if __name__ == "__main__":
if not os.path.exists(USB_DOWNLOAD_APP):
raise Error("gnet-imx28-usb-downloader is not present: please compile Armadeus first ",0)
- #usb = USBDevice()
- #apfBootloader = apf28Bootloader(usb)
-
- #apfBootloader.getStatus()
- #clear configuration request
-
+ if not os.path.exists(ELFTOSB_APP):
+ raise Error("elftosb is not present: please compile Armadeus first ",0)
- #print "--- Successfully initialized APF28, now loading U-Boot"
if not os.path.exists(BINARY):
raise Error("file "+BINARY+" doesn't exit",0)
-
- fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
- print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
-
- #apfBootloader.download("90000000", BINARY, fsize, "AA")
+ print "Opening serial port %s.." % port
try:
- os.system(USB_DOWNLOAD_APP + " -f " + BINARY)
+ ser = serial.Serial(port, SPEED, timeout=4)
except Exception, msg:
- print "Failed to upload image file to the target !"
+ print "Unable to open serial port %s !" % port
print msg
sys.exit()
+ ser.flush()
+ uboot = UBoot(ser)
+
+ print "Building NAND image file %s.." % NAND_BINARY
+
+ fsize = "%08x" % os.path.getsize(BINARY)
+ envfile = open(ENV_RECOVER, 'w')
+ envfile.write("fileaddr=40000000\n")
+ envfile.write("filesize=%s\n" % fsize)
+ envfile.close()
+
+
try:
- ser = serial.Serial(port, SPEED, timeout=2)
+ os.system(ELFTOSB_APP + " -zdf imx28 -c apf28-u-boot_recover.bd -o " + NAND_BINARY)
except Exception, msg:
- print "Unable to open serial port %s !" % port
+ print "Failed to build build NAND image filet !"
print msg
+ os.remove(NAND_BINARY);
+ os.remove(ENV_RECOVER);
sys.exit()
- ser.flush()
- uboot = UBoot(ser)
+ print "Downloading NAND image file %s.." % NAND_BINARY
+ try:
+ os.system(USB_DOWNLOAD_APP + " -f " + NAND_BINARY)
+ except Exception, msg:
+ print "Failed to upload NAND image file to the target !"
+ print msg
+ os.remove(NAND_BINARY);
+ os.remove(ENV_RECOVER);
+ sys.exit()
- # execute loaded code:
- #apfBootloader.put("90000000", "90000004", "l")
- #self.bootstrap.getStatus() ?
+ os.remove(NAND_BINARY);
+
+ print "--- Successfully initialized APF28, now loading U-Boot"
+
+ print "Loading %s, size = %d bytes.." % (BINARY, os.path.getsize(BINARY))
+ time.sleep(4)
+
+ try:
+ os.system(USB_DOWNLOAD_APP + " -f " + BINARY)
+ except Exception, msg:
+ print "Failed to upload image file to the target !"
+ print msg
+ sys.exit()
uboot.waitForPrompt()
eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
if eraseAll == 'y':
uboot.resetEnv()
- updateFlash = raw_input('\n--- Would you like to write U-Boot in Flash ? Y/n: ')
- if updateFlash != 'n':
- uboot.flash()
+
+ uboot.importEnv(ENV_DOWNLOAD, os.path.getsize(ENV_RECOVER))
+
+ os.remove(ENV_RECOVER);
+
+ print "Programming U-Boot in NAND flash.."
+ uboot.flash()
+
print "\n--- U-Boot successfully recovered !"
print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. Your board is running..."
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-12 23:47:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e09bbaa83698e97f7755564d5382106703888a37 (commit)
from 0c68c37e56ee71da3d42fcf48023116c2cf0f212 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e09bbaa83698e97f7755564d5382106703888a37
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 00:45:26 2012 +0100
[UBOOT] apf28: Fix memory corruption while computing RAM size - Fix typo - Move static IP config to Buildroot world
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 6 +++++-
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 11 +----------
.../u-boot/2011.12/501-imx28-update-and-fix.patch | 11 +++++++++++
patches/u-boot/2011.12/502-add-apf28.patch | 2 +-
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 4a1a695..bad767e 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -36,6 +36,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_STRACE=y
@@ -65,7 +66,10 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 997f950..2ea3539 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -27,7 +27,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "0.3"
-#define CONFIG_IDENT_STRING " apf28 patch 0.4"
+#define CONFIG_IDENT_STRING " apf28 patch 0.5"
/*
* SoC configurations
@@ -70,12 +70,8 @@
#define CONFIG_BOOTP_DNS2
*/
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.0.10
#define CONFIG_BOARD_NAME "apf28"
#define CONFIG_HOSTNAME "apf28"
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_SERVERIP 192.168.0.2
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
@@ -103,7 +99,6 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
-/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
@@ -410,7 +405,3 @@
#endif /* __APF28_H__ */
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf28
diff --git a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
index bd77201..d106c67 100644
--- a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
@@ -48,4 +48,15 @@ diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
void mx28_mem_init_clock(void)
{
struct mx28_clkctrl_regs *clkctrl_regs =
+--- u-boot-2011.12/common/memsize.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/common/memsize.c 2012-02-12 23:51:07.635786967 +0100
+@@ -74,6 +74,8 @@ long get_ram_size(long *base, long maxsi
+ return (0);
+ }
+
++ sync ();
++ *addr = save[i];
+ for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
+ addr = base + cnt; /* pointer arith! */
+ val = *addr;
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 1847f90..86a50dd 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1064,7 +1064,7 @@
+ goto err2;
+ }
+
-+ printf("NAND BCB tables updated\n");
++ printf("NAND BCB tables updated\n");
+ ret = 0;
+
+err2:
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-09 22:02:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0c68c37e56ee71da3d42fcf48023116c2cf0f212 (commit)
from 0bac4f2f36e16d0bcf852c389a149acb302253a0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0c68c37e56ee71da3d42fcf48023116c2cf0f212
Author: Eric Jarrige <eri...@ar...>
Date: Thu Feb 9 23:01:58 2012 +0100
[UBOOT] apf28: fix hidden characters in comments
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/502-add-apf28.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 01c583f..1847f90 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -273,7 +273,7 @@
+
+ if (otpctrl & OCOTP_CTRL_ERROR)
+ {
-+ printf("OCOTP error: CTRLÂ register value: 0x%x\n", otpctrl);
++ printf("OCOTP error: CTRL register value: 0x%x\n", otpctrl);
+ return -1;
+ }
+
@@ -298,7 +298,7 @@
+
+ if (otpctrl & OCOTP_CTRL_ERROR)
+ {
-+ printf("OCOTP in error: CTRLÂ register value: 0x%x\n", otpctrl);
++ printf("OCOTP in error: CTRL register value: 0x%x\n", otpctrl);
+ return val;
+ }
+
@@ -369,7 +369,7 @@
+ } else err = -1;
+
+
-+ /*Â restore HBUS, CLKSEQ and VDDIO */
++ /* restore HBUS, CLKSEQ and VDDIO */
+ writel(vddio, &power_regs->hw_power_vddioctrl);
+ writel(hbus, &clkctrl_regs->hw_clkctrl_hbus);
+ writel(clkseq, &clkctrl_regs->hw_clkctrl_clkseq);
@@ -556,7 +556,7 @@
+++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-08 23:00:37.501763289 +0100
@@ -0,0 +1,548 @@
+/*
-+ * i.MX28 NANDÂ Boot Control Blocks generator
++ * i.MX28 NAND Boot Control Blocks generator
+ *
+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
+ *
@@ -592,7 +592,7 @@
+#include <asm/arch/imx-regs.h>
+
+/*
-+ * BCB layout Read from OCOTPÂ fuses.
++ * BCB layout Read from OCOTP fuses.
+ */
+static uint32_t stride_pages;
+static uint32_t stride_count;
@@ -1064,7 +1064,7 @@
+ goto err2;
+ }
+
-+ printf("NANDÂ BCBÂ tables updated\n");
++ printf("NAND BCB tables updated\n");
+ ret = 0;
+
+err2:
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-09 01:10:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0bac4f2f36e16d0bcf852c389a149acb302253a0 (commit)
from 8e0bbeea13fa595eca3d86806d11881b3a77f083 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0bac4f2f36e16d0bcf852c389a149acb302253a0
Author: Eric Jarrige <eri...@ar...>
Date: Thu Feb 9 02:09:30 2012 +0100
[UBOOT] apf28:Â Improve stride_count computation
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2011.12/502-add-apf28.patch | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 7627f31..01c583f 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -554,7 +554,7 @@
+#########################################################################
--- u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-08 23:00:37.501763289 +0100
-@@ -0,0 +1,549 @@
+@@ -0,0 +1,548 @@
+/*
+ * i.MX28 NANDÂ Boot Control Blocks generator
+ *
@@ -1029,9 +1029,8 @@
+ stride_pages = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 4) & 0x0f) * 64;
+ if (stride_pages < 64) stride_pages = 64;
+
-+ stride_count = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
-+ if (stride_count < 1) stride_count = 2;
-+ stride_count = 2 << (stride_count-1); /* stride_count = 2^stride_count */
++ stride_count = 1 << ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
++ if (stride_count < 2) stride_count = 4;
+
+ if (firmware_max_size <= nand->erasesize)
+ firmware_max_size = 1 * 1024 * 1024;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-08 22:27:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8e0bbeea13fa595eca3d86806d11881b3a77f083 (commit)
via e8fdcbfd5435e1c271b2c4e7f099b7c0e5b7f0c9 (commit)
via ce6d681667d61c2ccb1eb47fdb5504bdea1cc1ad (commit)
via eb1d323741fae74206b17491fd5d93bb4e7a7026 (commit)
via 2a9d216134dc678b6e250ae4f83f12fc4765dfa2 (commit)
from ead0eaa2661d3bf8292da9c9f786ffaeb622aad3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8e0bbeea13fa595eca3d86806d11881b3a77f083
Merge: e8fdcbf ead0eaa
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 8 23:27:28 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e8fdcbfd5435e1c271b2c4e7f099b7c0e5b7f0c9
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 8 23:24:52 2012 +0100
[BUILDROOT] apf28: Use safe boot image u-boot.sb
commit ce6d681667d61c2ccb1eb47fdb5504bdea1cc1ad
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 8 23:22:18 2012 +0100
[UBOOT] apf28:Â Fix Fuse reg base address
commit eb1d323741fae74206b17491fd5d93bb4e7a7026
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 8 23:03:53 2012 +0100
[UBOOT] apf28:Â Add command to build BCB tables
commit 2a9d216134dc678b6e250ae4f83f12fc4765dfa2
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 7 23:15:28 2012 +0100
[UBOOT] apf28: makefile clean up
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 3 +-
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 26 +-
patches/u-boot/2011.12/502-add-apf28.patch | 559 +++++++++++++++++++-
3 files changed, 576 insertions(+), 12 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index e3e9091..318ab86 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -11,7 +11,8 @@ U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
ifeq ($(BOARD_NAME),apf9328)
U_BOOT_BIN=u-boot.bin
else ifeq ($(BOARD_NAME),apf28)
-U_BOOT_BIN=u-boot.nand
+U_BOOT_BIN=u-boot.sb
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
TARGETS+=host-elftosb host-imx28-usb-downloader
else
U_BOOT_BIN=u-boot-nand.bin
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 469111e..997f950 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -26,8 +26,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.2"
-#define CONFIG_IDENT_STRING " apf28 patch 0.3"
+#define CONFIG_ENV_VERSION "0.3"
+#define CONFIG_IDENT_STRING " apf28 patch 0.4"
/*
* SoC configurations
@@ -280,9 +280,10 @@
/*
* OCOTP
*/
+/*
#define CONFIG_IMX_OCOTP
#define IMX_OCOTP_BASE MXS_OCOTP_BASE
-
+*/
/*
* Boot Linux
*/
@@ -370,11 +371,18 @@
"nand write ${loadaddr} ${fw_off} ${filesize} ; " \
"fi\0" \
"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
- "nand erase ${uboot_offset} ${uboot_len};" \
- "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
+ "run update_nand_get_fcb_size ; " \
+ "setexpr fcb_sz ${update_nand_fcb} * 2 ; " /* FCB + DBBT */ \
+ "setexpr fw_sz ${update_nand_firmware_maxsz} * 2 ; " \
+ "setexpr fw_off ${fcb_sz} + ${update_nand_firmware_maxsz};" \
+ "if bcb write.nand ; then " \
+ "nand erase ${fcb_sz} ${fw_sz} ; " \
+ "nand write ${fileaddr} ${fw_off} ${filesize};" \
+ "if nand write ${fileaddr} ${fcb_sz} ${filesize};" \
"then nand lock; nand unlock ${env_offset};" \
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
+ "fi; " \
"fi; \0" \
"flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
"if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize};"\
@@ -389,12 +397,12 @@
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
+ " ${serverpath}${board_name}-u-boot.sb\0" \
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-rootfs.ubi\0" \
- "update_uboot=run update_nand_full\0" \
+ "update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run download_kernel flash_kernel download_rootfs " \
@@ -402,3 +410,7 @@
#endif /* __APF28_H__ */
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf28
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 7d679f5..7627f31 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -500,8 +500,8 @@
+ "- Blow fecmac<n> MAC address");
+
--- u-boot-2011.12/board/armadeus/apf28/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2011.12/board/armadeus/apf28/Makefile 2012-02-07 01:39:18.114788951 +0100
-@@ -0,0 +1,51 @@
++++ u-boot-2011.12/board/armadeus/apf28/Makefile 2012-02-07 23:17:03.256451604 +0100
+@@ -0,0 +1,50 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd...@de....
@@ -530,13 +530,12 @@
+LIB = $(obj)lib$(BOARD).o
+
+ifndef CONFIG_SPL_BUILD
-+COBJS := apf28.o
+COBJS-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
++COBJS := $(COBJS-y) mx28_bcb.o apf28.o
+else
+COBJS := spl_boot.o
+endif
+
-+COBJS += $(COBJS-y)
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
@@ -553,6 +552,558 @@
+sinclude $(obj).depend
+
+#########################################################################
+--- u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2011.12/board/armadeus/apf28/mx28_bcb.c 2012-02-08 23:00:37.501763289 +0100
+@@ -0,0 +1,549 @@
++/*
++ * i.MX28 NANDÂ Boot Control Blocks generator
++ *
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ *
++ * Based on code from mxsboot:
++ * Freescale i.MX28 image generator
++ *
++ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
++ * on behalf of DENX Software Engineering GmbH
++ *
++ * 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 <asm/io.h>
++#include <common.h>
++#include <malloc.h>
++#include <nand.h>
++#include <asm/arch/imx-regs.h>
++
++/*
++ * BCB layout Read from OCOTPÂ fuses.
++ */
++static uint32_t stride_pages;
++static uint32_t stride_count;
++
++/*
++ * Sector on which the SigmaTel boot partition (0x53) starts.
++ */
++uint32_t sd_sector = 2048;
++
++/* i.MX28 NAND controller-specific constants. DO NOT TWEAK! */
++#define MXS_NAND_DMA_DESCRIPTOR_COUNT 4
++#define MXS_NAND_CHUNK_DATA_CHUNK_SIZE 512
++#define MXS_NAND_METADATA_SIZE 10
++#define MXS_NAND_COMMAND_BUFFER_SIZE 32
++
++struct mx28_nand_fcb {
++ uint32_t checksum;
++ uint32_t fingerprint;
++ uint32_t version;
++ struct {
++ uint8_t data_setup;
++ uint8_t data_hold;
++ uint8_t address_setup;
++ uint8_t dsample_time;
++ uint8_t nand_timing_state;
++ uint8_t rea;
++ uint8_t rloh;
++ uint8_t rhoh;
++ } timing;
++ uint32_t page_data_size;
++ uint32_t total_page_size;
++ uint32_t sectors_per_block;
++ uint32_t number_of_nands; /* Ignored */
++ uint32_t total_internal_die; /* Ignored */
++ uint32_t cell_type; /* Ignored */
++ uint32_t ecc_block_n_ecc_type;
++ uint32_t ecc_block_0_size;
++ uint32_t ecc_block_n_size;
++ uint32_t ecc_block_0_ecc_type;
++ uint32_t metadata_bytes;
++ uint32_t num_ecc_blocks_per_page;
++ uint32_t ecc_block_n_ecc_level_sdk; /* Ignored */
++ uint32_t ecc_block_0_size_sdk; /* Ignored */
++ uint32_t ecc_block_n_size_sdk; /* Ignored */
++ uint32_t ecc_block_0_ecc_level_sdk; /* Ignored */
++ uint32_t num_ecc_blocks_per_page_sdk; /* Ignored */
++ uint32_t metadata_bytes_sdk; /* Ignored */
++ uint32_t erase_threshold;
++ uint32_t boot_patch;
++ uint32_t patch_sectors;
++ uint32_t firmware1_starting_sector;
++ uint32_t firmware2_starting_sector;
++ uint32_t sectors_in_firmware1;
++ uint32_t sectors_in_firmware2;
++ uint32_t dbbt_search_area_start_address;
++ uint32_t badblock_marker_byte;
++ uint32_t badblock_marker_start_bit;
++ uint32_t bb_marker_physical_offset;
++};
++
++struct mx28_nand_dbbt {
++ uint32_t checksum;
++ uint32_t fingerprint;
++ uint32_t version;
++ uint32_t number_bb;
++ uint32_t number_2k_pages_bb;
++};
++
++struct mx28_nand_bbt {
++ uint32_t nand;
++ uint32_t number_bb;
++ uint32_t badblock[510];
++};
++
++struct mx28_sd_drive_info {
++ uint32_t chip_num;
++ uint32_t drive_type;
++ uint32_t tag;
++ uint32_t first_sector_number;
++ uint32_t sector_count;
++};
++
++struct mx28_sd_config_block {
++ uint32_t signature;
++ uint32_t primary_boot_tag;
++ uint32_t secondary_boot_tag;
++ uint32_t num_copies;
++ struct mx28_sd_drive_info drv_info[1];
++};
++
++static inline uint32_t mx28_nand_ecc_size_in_bits(uint32_t ecc_strength)
++{
++ return ecc_strength * 13;
++}
++
++static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
++ uint32_t page_oob_size)
++{
++ if (page_data_size == 2048)
++ return 8;
++
++ if (page_data_size == 4096) {
++ if (page_oob_size == 128)
++ return 8;
++
++ if (page_oob_size == 218)
++ return 16;
++ }
++
++ return 0;
++}
++
++static inline uint32_t mx28_nand_get_mark_offset(uint32_t page_data_size,
++ uint32_t ecc_strength)
++{
++ uint32_t chunk_data_size_in_bits;
++ uint32_t chunk_ecc_size_in_bits;
++ uint32_t chunk_total_size_in_bits;
++ uint32_t block_mark_chunk_number;
++ uint32_t block_mark_chunk_bit_offset;
++ uint32_t block_mark_bit_offset;
++
++ chunk_data_size_in_bits = MXS_NAND_CHUNK_DATA_CHUNK_SIZE * 8;
++ chunk_ecc_size_in_bits = mx28_nand_ecc_size_in_bits(ecc_strength);
++
++ chunk_total_size_in_bits =
++ chunk_data_size_in_bits + chunk_ecc_size_in_bits;
++
++ /* Compute the bit offset of the block mark within the physical page. */
++ block_mark_bit_offset = page_data_size * 8;
++
++ /* Subtract the metadata bits. */
++ block_mark_bit_offset -= MXS_NAND_METADATA_SIZE * 8;
++
++ /*
++ * Compute the chunk number (starting at zero) in which the block mark
++ * appears.
++ */
++ block_mark_chunk_number =
++ block_mark_bit_offset / chunk_total_size_in_bits;
++
++ /*
++ * Compute the bit offset of the block mark within its chunk, and
++ * validate it.
++ */
++ block_mark_chunk_bit_offset = block_mark_bit_offset -
++ (block_mark_chunk_number * chunk_total_size_in_bits);
++
++ if (block_mark_chunk_bit_offset > chunk_data_size_in_bits)
++ return 1;
++
++ /*
++ * Now that we know the chunk number in which the block mark appears,
++ * we can subtract all the ECC bits that appear before it.
++ */
++ block_mark_bit_offset -=
++ block_mark_chunk_number * chunk_ecc_size_in_bits;
++
++ return block_mark_bit_offset;
++}
++
++static inline uint32_t mx28_nand_mark_byte_offset(nand_info_t *nand)
++{
++ uint32_t ecc_strength;
++ ecc_strength = mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
++ return mx28_nand_get_mark_offset(nand->writesize, ecc_strength) >> 3;
++}
++
++static inline uint32_t mx28_nand_mark_bit_offset(nand_info_t *nand)
++{
++ uint32_t ecc_strength;
++ ecc_strength = mx28_nand_get_ecc_strength(nand->writesize, nand->oobsize);
++ return mx28_nand_get_mark_offset(nand->writesize, ecc_strength) & 0x7;
++}
++
++static uint32_t mx28_nand_block_csum(uint8_t *block, uint32_t size)
++{
++ uint32_t csum = 0;
++ int i;
++
++ for (i = 0; i < size; i++)
++ csum += block[i];
++
++ return csum ^ 0xffffffff;
++}
++
++static struct mx28_nand_fcb *mx28_nand_get_fcb(nand_info_t *nand, uint32_t size)
++{
++ struct mx28_nand_fcb *fcb;
++ uint32_t bcb_size_bytes;
++ uint32_t stride_size_bytes;
++ uint32_t bootstream_size_pages;
++ uint32_t fw1_start_page;
++ uint32_t fw2_start_page;
++
++ fcb = malloc(nand->writesize);
++ if (!fcb) {
++ printf("MX28 NAND: Unable to allocate FCB\n");
++ return NULL;
++ }
++
++ memset(fcb, 0, nand->writesize);
++
++ fcb->fingerprint = 0x20424346;
++ fcb->version = 0x01000000;
++
++ /*
++ * FIXME: These here are default values as found in kobs-ng. We should
++ * probably retrieve the data from NAND or something.
++ */
++ fcb->timing.data_setup = 80;
++ fcb->timing.data_hold = 60;
++ fcb->timing.address_setup = 25;
++ fcb->timing.dsample_time = 6;
++
++ fcb->page_data_size = nand->writesize;
++ fcb->total_page_size = nand->writesize + nand->oobsize;
++ fcb->sectors_per_block = nand->erasesize / nand->writesize;
++
++ fcb->num_ecc_blocks_per_page = (nand->writesize / 512) - 1;
++ fcb->ecc_block_0_size = 512;
++ fcb->ecc_block_n_size = 512;
++ fcb->metadata_bytes = 10;
++
++ if (nand->writesize == 2048) {
++ fcb->ecc_block_n_ecc_type = 4;
++ fcb->ecc_block_0_ecc_type = 4;
++ } else if (nand->writesize == 4096) {
++ if (nand->oobsize == 128) {
++ fcb->ecc_block_n_ecc_type = 4;
++ fcb->ecc_block_0_ecc_type = 4;
++ } else if (nand->oobsize == 218) {
++ fcb->ecc_block_n_ecc_type = 8;
++ fcb->ecc_block_0_ecc_type = 8;
++ }
++ }
++
++ if (fcb->ecc_block_n_ecc_type == 0) {
++ printf("MX28 NAND: Unsupported NAND geometry\n");
++ goto err;
++ }
++
++ fcb->boot_patch = 0;
++ fcb->patch_sectors = 0;
++
++ fcb->badblock_marker_byte = mx28_nand_mark_byte_offset(nand);
++ fcb->badblock_marker_start_bit = mx28_nand_mark_bit_offset(nand);
++ fcb->bb_marker_physical_offset = nand->writesize;
++
++ stride_size_bytes = stride_pages * nand->writesize;
++ bcb_size_bytes = stride_size_bytes * stride_count;
++
++ bootstream_size_pages = (size + (nand->writesize - 1)) /
++ nand->writesize;
++
++ fw1_start_page = 2 * bcb_size_bytes / nand->writesize;
++ fw2_start_page = (2 * bcb_size_bytes + size) /
++ nand->writesize;
++
++ fcb->firmware1_starting_sector = fw1_start_page;
++ fcb->firmware2_starting_sector = fw2_start_page;
++ fcb->sectors_in_firmware1 = bootstream_size_pages;
++ fcb->sectors_in_firmware2 = bootstream_size_pages;
++
++ fcb->dbbt_search_area_start_address = stride_pages * stride_count;
++
++ return fcb;
++
++err:
++ free(fcb);
++ return NULL;
++}
++
++static struct mx28_nand_dbbt *mx28_nand_get_dbbt(nand_info_t *nand)
++{
++ struct mx28_nand_dbbt *dbbt;
++
++ dbbt = malloc(nand->writesize);
++ if (!dbbt) {
++ printf("MX28 NAND: Unable to allocate DBBT\n");
++ return NULL;
++ }
++
++ memset(dbbt, 0, nand->writesize);
++
++ dbbt->fingerprint = 0x54424244;
++ dbbt->version = 0x1;
++
++ return dbbt;
++}
++
++static inline uint8_t mx28_nand_parity_13_8(const uint8_t b)
++{
++ uint32_t parity = 0, tmp;
++
++ tmp = ((b >> 6) ^ (b >> 5) ^ (b >> 3) ^ (b >> 2)) & 1;
++ parity |= tmp << 0;
++
++ tmp = ((b >> 7) ^ (b >> 5) ^ (b >> 4) ^ (b >> 2) ^ (b >> 1)) & 1;
++ parity |= tmp << 1;
++
++ tmp = ((b >> 7) ^ (b >> 6) ^ (b >> 5) ^ (b >> 1) ^ (b >> 0)) & 1;
++ parity |= tmp << 2;
++
++ tmp = ((b >> 7) ^ (b >> 4) ^ (b >> 3) ^ (b >> 0)) & 1;
++ parity |= tmp << 3;
++
++ tmp = ((b >> 6) ^ (b >> 4) ^ (b >> 3) ^
++ (b >> 2) ^ (b >> 1) ^ (b >> 0)) & 1;
++ parity |= tmp << 4;
++
++ return parity;
++}
++
++static uint8_t *mx28_nand_fcb_block(nand_info_t *nand, struct mx28_nand_fcb *fcb)
++{
++ uint8_t *block;
++ uint8_t *ecc;
++ int i;
++
++ block = malloc(nand->writesize + nand->oobsize);
++ if (!block) {
++ printf("MX28 NAND: Unable to allocate FCB block\n");
++ return NULL;
++ }
++
++ memset(block, 0, nand->writesize + nand->oobsize);
++
++ /* Update the FCB checksum */
++ fcb->checksum = mx28_nand_block_csum(((uint8_t *)fcb) + 4, 508);
++
++ /* Figure 12-11. in iMX28RM, rev. 1, says FCB is at offset 12 */
++ memcpy(block + 12, fcb, sizeof(struct mx28_nand_fcb));
++
++ /* ECC is at offset 12 + 512 */
++ ecc = block + 12 + 512;
++
++ /* Compute the ECC parity */
++ for (i = 0; i < sizeof(struct mx28_nand_fcb); i++)
++ ecc[i] = mx28_nand_parity_13_8(block[i + 12]);
++
++ return block;
++}
++
++
++static int mx28_nand_write_fcb(nand_info_t *nand, struct mx28_nand_fcb *fcb)
++{
++ uint32_t offset;
++ uint8_t *fcbblock;
++ int ret = 0;
++ int i;
++ nand_erase_options_t opts;
++
++ fcbblock = mx28_nand_fcb_block(nand, fcb);
++ if (!fcbblock)
++ return -1;
++
++ memset(&opts, 0, sizeof(opts));
++ opts.offset = 0;
++ opts.length = stride_pages * stride_count * nand->writesize;
++ opts.jffs2 = 0;
++ opts.quiet = 1;
++ opts.spread = 0;
++ opts.scrub = 1;
++
++ printf("Erasing FCB...\n");
++ if (!nand_erase_opts(nand, &opts)) {
++ mtd_oob_ops_t ops = {
++ .datbuf = (u8 *)fcbblock,
++ .oobbuf = (u8 *)fcbblock + nand->writesize,
++ .len = nand->writesize,
++ .ooblen = nand->oobsize,
++ .mode = MTD_OOB_RAW
++ };
++
++ printf("Writing FCB...\n");
++
++ for (i = 0; i < stride_pages * stride_count; i += stride_pages) {
++ offset = i * nand->writesize;
++ ret = nand->write_oob(nand, offset, &ops);
++ }
++ }
++ free(fcbblock);
++ return ret;
++}
++
++static int mx28_nand_write_dbbt(nand_info_t *nand, struct mx28_nand_dbbt *dbbt)
++{
++ uint32_t offset;
++ int i = stride_pages * stride_count, ret = 0;
++
++ nand_erase_options_t opts;
++
++ memset(&opts, 0, sizeof(opts));
++ opts.offset = stride_pages * stride_count * nand->writesize;
++ opts.length = stride_pages * stride_count * nand->writesize;
++ opts.jffs2 = 0;
++ opts.quiet = 1;
++ opts.spread = 0;
++ opts.scrub = 1;
++
++ printf("Erasing DBBT...\n");
++ if (!nand_erase_opts(nand, &opts)) {
++ mtd_oob_ops_t ops = {
++ .datbuf = (u8 *)dbbt,
++ .oobbuf = (u8 *)dbbt + nand->writesize,
++ .len = nand->writesize,
++ .ooblen = nand->oobsize,
++ .mode = MTD_OOB_RAW
++ };
++
++ printf("Writing DBBT...\n");
++
++ for (; i < 2 * stride_pages * stride_count; i += stride_pages) {
++ offset = i * nand->writesize;
++ ret = nand->write_oob(nand, offset, &ops);
++ }
++
++ }
++
++ return ret;
++}
++
++
++static int mx28_update_nand_bcb(int firmware_max_size)
++{
++ struct mx28_nand_fcb *fcb;
++ struct mx28_nand_dbbt *dbbt;
++ int ret = -1;
++ nand_info_t *nand = &nand_info[0];
++ struct mx28_ocotp_regs *ocotp_regs =
++ (struct mx28_ocotp_regs *)MXS_OCOTP_BASE;
++
++ stride_pages = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 4) & 0x0f) * 64;
++ if (stride_pages < 64) stride_pages = 64;
++
++ stride_count = ((readl(&ocotp_regs->hw_ocotp_rom1) >> 8) & 0x0f);
++ if (stride_count < 1) stride_count = 2;
++ stride_count = 2 << (stride_count-1); /* stride_count = 2^stride_count */
++
++ if (firmware_max_size <= nand->erasesize)
++ firmware_max_size = 1 * 1024 * 1024;
++
++ debug("stride_pages= %d\n", stride_pages);
++ debug("stride_count= %d\n", stride_count);
++ debug("firmware_max_size= %x\n", firmware_max_size);
++
++ fcb = mx28_nand_get_fcb(nand, firmware_max_size);
++ if (!fcb) {
++ printf("Unable to build FCB\n");
++ goto err0;
++ }
++
++ dbbt = mx28_nand_get_dbbt(nand);
++ if (!dbbt) {
++ printf("Unable to build DBBT\n");
++ goto err1;
++ }
++
++ ret = mx28_nand_write_fcb(nand, fcb);
++ if (ret) {
++ printf("Unable to write FCB to NAND\n");
++ goto err2;
++ }
++
++
++ ret = mx28_nand_write_dbbt(nand, dbbt);
++ if (ret) {
++ printf("Unable to write DBBT to NAND\n");
++ goto err2;
++ }
++
++ printf("NANDÂ BCBÂ tables updated\n");
++ ret = 0;
++
++err2:
++ free(dbbt);
++err1:
++ free(fcb);
++err0:
++ return ret;
++}
++
++int do_bcb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
++{
++ int err = 0;
++ int arg = (1 * 1024 * 1024);
++
++ if (argc < 2 || argc > 3)
++ goto usage;
++
++ if (strcmp(argv[1], "write.nand") == 0) {
++ if (argc == 3) {
++ arg = simple_strtoul(argv[2], NULL, 16);
++ }
++ err = mx28_update_nand_bcb(arg);
++ } else {
++ goto usage;
++ }
++
++ return err;
++usage:
++ return cmd_usage(cmdtp);
++}
++
++U_BOOT_CMD(
++ bcb, 2, 1, do_bcb,
++ "mx28 Boot Control Block sub system",
++ "write.nand [Firmware max size] - Update NAND BCB tables\n"
++ " default firmware max size is 1MiB");
++
--- u-boot-2011.12/board/armadeus/apf28/spl_boot.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/spl_boot.c 2012-01-29 10:12:49.295977402 +0100
@@ -0,0 +1,203 @@
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-08 10:10:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ead0eaa2661d3bf8292da9c9f786ffaeb622aad3 (commit)
via c129553e3312bd1379da8af8b0b7c82cb96bcfd2 (commit)
via 0afefb09c0b89d1c4cce202094f65a007827940a (commit)
from f0ec980317703907d1695d8e440e25ed7a2dd514 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ead0eaa2661d3bf8292da9c9f786ffaeb622aad3
Merge: c129553 f0ec980
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 11:09:28 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c129553e3312bd1379da8af8b0b7c82cb96bcfd2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 11:08:41 2012 +0100
[BUILDROOT] Makes 2.6.35.3 the default APF28 kernel version
commit 0afefb09c0b89d1c4cce202094f65a007827940a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 09:58:29 2012 +0100
[BUILDROOT] Fixes 169-python-update_from_BR_mainline.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 6 +-
.../169-python-update_from_BR_mainline.patch | 120 ++++++++++----------
2 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index e4f1e6a..4a1a695 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -8,7 +8,7 @@ BR2_JLEVEL=1
BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.1"
+BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
@@ -68,7 +68,7 @@ BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
+BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
index 8cd7039..b9ea015 100644
--- a/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
+++ b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
@@ -2,9 +2,9 @@ Updates python package by taking BR mainline as reference
Can be removed when migrating BR to 2012.02
-diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch
+diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch
--- buildroot/package/python/python-2.7-001-support-for-build.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch 2011-09-30 17:12:38.000000000 +0200
@@ -22,11 +22,11 @@
configure.in | 17 +++++++++++++++++
2 files changed, 34 insertions(+), 15 deletions(-)
@@ -108,9 +108,9 @@ diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch /home/
done
AC_MSG_RESULT(done)
-diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch
+diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch
--- buildroot/package/python/python-2.7-002-cross-compile-variable.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch 2011-09-30 17:12:38.000000000 +0200
@@ -15,11 +15,11 @@
configure.in | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
@@ -152,9 +152,9 @@ diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch /
AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])
AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])
-diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch
+diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch
--- buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-09-30 17:12:38.000000000 +0200
@@ -9,10 +9,10 @@
setup.py | 4 ++++
1 file changed, 4 insertions(+)
@@ -169,9 +169,9 @@ diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling
@@ -304,6 +304,10 @@
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name)
-diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch
+diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch
--- buildroot/package/python/python-2.7-004-no-host-headers-libs.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,23 +10,37 @@
setup.py | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
@@ -251,9 +251,9 @@ diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch /ho
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
f = "/usr/include/db.h"
-diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch
+diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch
--- buildroot/package/python/python-2.7-005-staging-headers-libs.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
@@ -12,12 +12,12 @@
setup.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
@@ -272,9 +272,9 @@ diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch /ho
def detect_modules(self):
+ try:
-diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch
+diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch
--- buildroot/package/python/python-2.7-006-disable-extensions.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch 2011-09-30 17:12:38.000000000 +0200
@@ -38,11 +38,11 @@
setup.py | 5 ++++-
3 files changed, 11 insertions(+), 4 deletions(-)
@@ -339,9 +339,9 @@ diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch /home
@@ -21,7 +21,10 @@
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch
+diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch
--- buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-09-30 17:12:38.000000000 +0200
@@ -13,11 +13,11 @@
Makefile.pre.in | 9 ---------
1 file changed, 9 deletions(-)
@@ -358,9 +358,9 @@ diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patc
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
$(DESTDIR)$(LIBDEST)
-diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch
+diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch
--- buildroot/package/python/python-2.7-008-reread-environment.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch 2011-09-30 17:12:38.000000000 +0200
@@ -25,11 +25,11 @@
setup.py | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
@@ -400,9 +400,9 @@ diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch /home
@@ -20,6 +20,9 @@
# Were we compiled --with-pydebug or with #define Py_DEBUG?
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch
+diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch
--- buildroot/package/python/python-2.7-009-python-symlink.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,11 +10,11 @@
Makefile.pre.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -419,9 +419,9 @@ diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch /home/jul
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
-diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch
+diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch
--- buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-09-30 17:12:38.000000000 +0200
@@ -26,10 +26,10 @@
Makefile.pre.in | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
@@ -477,9 +477,9 @@ diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.pat
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
-diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch
+diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch
--- buildroot/package/python/python-2.7-011-no-rpath.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch 2011-09-30 17:12:38.000000000 +0200
@@ -13,11 +13,11 @@
setup.py | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
@@ -523,9 +523,9 @@ diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch /home/julien/wo
elif cand == "bdb":
if db_incs is not None:
print "building dbm using bdb"
-diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch
+diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch
--- buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-09-30 17:12:38.000000000 +0200
@@ -16,10 +16,10 @@
setup.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
@@ -558,9 +558,9 @@ diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patc
missing.append('_codecs_%s' % loc)
# Dynamic loading module
-diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch
+diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch
--- buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,24 @@
+Index: Python-2.7.2/configure
+===================================================================
@@ -586,9 +586,9 @@ diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch
+ '') MACHDEP="unknown";;
+ esac
+ fi
-diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch
+diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch
--- buildroot/package/python/python-2.7-014-verbose-module-build.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,19 @@
+Enables verbose output when building modules
+
@@ -609,9 +609,9 @@ diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch /ho
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
+ esac
+
-diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch
+diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch
--- buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,84 @@
+Add some cross-compilation fixes to distutils
+
@@ -697,9 +697,9 @@ diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-su
+ # generate output files
+ AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
-diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch
+diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch
--- buildroot/package/python/python-2.7-100-optional-test-modules.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,20 +10,19 @@
configure.in | 6 ++++++
2 files changed, 33 insertions(+), 13 deletions(-)
@@ -780,9 +780,9 @@ diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch /h
fi
-diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch
+diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch
--- buildroot/package/python/python-2.7-101-optional-pydoc.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,11 +11,11 @@
setup.py | 10 +++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
@@ -853,9 +853,9 @@ diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch /home/jul
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
-diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch
+diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch
--- buildroot/package/python/python-2.7-102-optional-2to3.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,34 +11,29 @@
setup.py | 5 +++--
3 files changed, 26 insertions(+), 9 deletions(-)
@@ -940,9 +940,9 @@ diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch /home/juli
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
-diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch
+diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch
--- buildroot/package/python/python-2.7-103-optional-sqlite.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 9 +++++++++
1 file changed, 9 insertions(+)
@@ -959,9 +959,9 @@ diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch /home/ju
esac])
fi
-diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch
+diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch
--- buildroot/package/python/python-2.7-104-optional-tk.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch 2011-09-30 17:12:38.000000000 +0200
@@ -7,31 +7,30 @@
configure.in | 9 +++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
@@ -1023,9 +1023,9 @@ diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch /home/julien
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
-diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch
+diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch
--- buildroot/package/python/python-2.7-105-optional-curses.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch 2011-09-30 17:12:38.000000000 +0200
@@ -7,11 +7,11 @@
configure.in | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -1069,9 +1069,9 @@ diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch /home/ju
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
-diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch
+diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch
--- buildroot/package/python/python-2.7-106-optional-expat.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch 2011-09-30 17:12:38.000000000 +0200
@@ -14,20 +14,20 @@
setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
@@ -1133,9 +1133,9 @@ diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch /home/jul
#
# More information on Expat can be found at www.libexpat.org.
#
-diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch
+diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch
--- buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1152,9 +1152,9 @@ diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch /hom
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
-diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch
+diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch
--- buildroot/package/python/python-2.7-108-optional-nis.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch 2011-09-30 17:12:38.000000000 +0200
@@ -9,11 +9,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1171,9 +1171,9 @@ diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch /home/julie
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
-diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch
+diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch
--- buildroot/package/python/python-2.7-109-optional-unicodedata.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1190,9 +1190,9 @@ diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch /ho
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-110-optional-db.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch
+diff -urN buildroot/package/python/python-2.7-110-optional-db.patch buildroot_git_dev/package/python/python-2.7-110-optional-db.patch
--- buildroot/package/python/python-2.7-110-optional-db.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-110-optional-db.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,28 +11,29 @@
configure.in | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
@@ -1253,9 +1253,9 @@ diff -urN buildroot/package/python/python-2.7-110-optional-db.patch /home/julien
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch
+diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch
--- buildroot/package/python/python-2.7-111-optional-ssl.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1272,9 +1272,9 @@ diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch /home/julie
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch
+diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch
--- buildroot/package/python/python-2.7-112-optional-bzip2.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch 2011-09-30 17:12:38.000000000 +0200
@@ -5,11 +5,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1291,9 +1291,9 @@ diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch /home/jul
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
-diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch
+diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch
--- buildroot/package/python/python-2.7-113-optional-zlib.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch 2011-09-30 17:12:38.000000000 +0200
@@ -5,11 +5,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1310,9 +1310,9 @@ diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch /home/juli
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
-diff -urN buildroot/package/python/python.mk /home/julien/workspace/buildroot_git_dev/package/python/python.mk
+diff -urN buildroot/package/python/python.mk buildroot_git_dev/package/python/python.mk
--- buildroot/package/python/python.mk 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python.mk 2012-01-10 16:28:47.000000000 +0100
++++ buildroot_git_dev/package/python/python.mk 2012-01-10 16:28:47.000000000 +0100
@@ -4,7 +4,7 @@
#
#############################################################
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2012-02-07 14:55:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f0ec980317703907d1695d8e440e25ed7a2dd514 (commit)
from 8e9c7abcdcce343f9fa47e39ecf1d26edce6b2c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f0ec980317703907d1695d8e440e25ed7a2dd514
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 7 15:55:32 2012 +0100
[UBOOT] apf28: support read/blow MAC from otp fuses
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 9 +-
patches/u-boot/2011.12/502-add-apf28.patch | 292 +++++++++++++++++++-
2 files changed, 295 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index cbd0f07..469111e 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -27,7 +27,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "0.2"
-#define CONFIG_IDENT_STRING " apf28 patch 0.2"
+#define CONFIG_IDENT_STRING " apf28 patch 0.3"
/*
* SoC configurations
@@ -235,6 +235,7 @@
#define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_M28_FEC_MAC_IN_OCOTP
#endif
+#define ACFG_OUI 0x001EAC
/*
* I2C
@@ -277,6 +278,12 @@
#endif
/*
+ * OCOTP
+ */
+#define CONFIG_IMX_OCOTP
+#define IMX_OCOTP_BASE MXS_OCOTP_BASE
+
+/*
* Boot Linux
*/
#define CONFIG_CMDLINE_TAG
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 77846ce..7d679f5 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1,6 +1,6 @@
--- u-boot-2011.12/board/armadeus/apf28/apf28.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2011.12/board/armadeus/apf28/apf28.c 2012-01-29 09:57:15.183543034 +0100
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,220 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
@@ -197,8 +197,10 @@
+
+ data = readl(&ocotp_regs->hw_ocotp_cust0);
+
-+ mac[0] = 0x00;
-+ mac[1] = 0x1E;
++ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
++
++ mac[0] = (ACFG_OUI>> 16) & 0xff;
++ mac[1] = (ACFG_OUI>> 8) & 0xff;
+ mac[2] = (data >> 24) & 0xff;
+ mac[3] = (data >> 16) & 0xff;
+ mac[4] = (data >> 8) & 0xff;
@@ -219,9 +221,287 @@
+ /* dcache_enable(); */
+}
+#endif
+--- u-boot-2011.12/board/armadeus/apf28/cmd_ocotp.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-custom/board/armadeus/apf28/cmd_ocotp.c 2012-02-07 15:06:34.016328417 +0100
+@@ -0,0 +1,275 @@
++/*
++ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ *
++ * 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 <linux/types.h>
++#include <asm/io.h>
++#include <command.h>
++#include <common.h>
++#include <asm/arch/imx-regs.h>
++#include <asm/arch/sys_proto.h>
++
++#define MXS_OCOTP_MAX_TIMEOUT 1000000
++
++static struct mx28_ocotp_regs *ocotp_regs =
++ (struct mx28_ocotp_regs *)IMX_OCOTP_BASE;
++
++int otp_error(void)
++{
++ u32 otpctrl;
++
++ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ MXS_OCOTP_MAX_TIMEOUT))
++ {
++ printf("OCOTP still busy after timeout \n");
++ return -1;
++ }
++
++ otpctrl = readl(&ocotp_regs->hw_ocotp_ctrl_reg);
++
++ if (otpctrl & OCOTP_CTRL_ERROR)
++ {
++ printf("OCOTP error: CTRLÂ register value: 0x%x\n", otpctrl);
++ return -1;
++ }
++
++ return 0;
++}
++
++int otp_read(int addr)
++{
++ u32 val = 0, otpctrl;
++
++ if ((addr < 0) || (addr > 0x27))
++ {
++ printf("Invalid address! (should be between 0 and 0x27)\n");
++ return val;
++ }
++
++ if (otp_error())
++ {
++ return val;
++ }
++ otpctrl = readl(&ocotp_regs->hw_ocotp_ctrl_reg);
++
++ if (otpctrl & OCOTP_CTRL_ERROR)
++ {
++ printf("OCOTP in error: CTRLÂ register value: 0x%x\n", otpctrl);
++ return val;
++ }
++
++ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
++
++ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ MXS_OCOTP_MAX_TIMEOUT)) {
++ printf("OCOTP Busy: Can't open OCOTP bank\n");
++ return val;
++ }
++
++ val = readl(&ocotp_regs->hw_ocotp_cust0 + (addr << 4));
++
++ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
++
++ return val;
++}
++
++int otp_blow(unsigned int addr, unsigned int data)
++{
++ u32 hbus, clkseq, vddio;
++ int err = 0;
++ struct mx28_clkctrl_regs *clkctrl_regs =
++ (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
++ struct mx28_power_regs *power_regs =
++ (struct mx28_power_regs *)MXS_POWER_BASE;
++
++ if ((addr < 0) || (addr > 0x27))
++ {
++ printf("Invalid address! (should be between 0 and 0x27)\n");
++ return -1;
++ }
++
++ /* Save HBUS, CLKSEQ and VDDIO */
++ hbus = readl(&clkctrl_regs->hw_clkctrl_hbus_reg);
++ clkseq = readl(&clkctrl_regs->hw_clkctrl_clkseq_reg);
++ vddio = readl(&power_regs->hw_power_vddioctrl);
++
++ /* Force HBUS and CPU down to 24 MHz */
++ writel(CLKCTRL_CLKSEQ_BYPASS_CPU, &clkctrl_regs->hw_clkctrl_clkseq_set);
++ writel(1 << CLKCTRL_HBUS_DIV_OFFSET, &clkctrl_regs->hw_clkctrl_hbus_set);
++ writel(CLKCTRL_HBUS_DIV_MASK - 1, &clkctrl_regs->hw_clkctrl_hbus_clr);
++
++ /* Change VDDIO to 2.8V while burning the fuses */
++ writel(POWER_VDDIOCTRL_TRG_MASK, &clkctrl_regs->hw_clkctrl_hbus_clr);
++
++ /* Disable read bank */
++ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
++
++ /* Check ocotp status busy and error */
++ if (!otp_error())
++ {
++ /* initiate fuse blow at addr.. */
++ writel(OCOTP_CTRL_WR_UNLOCK_KEY | (addr & OCOTP_CTRL_ADDR_MASK),
++ &ocotp_regs->hw_ocotp_ctrl);
++
++ /* Start writing data */
++ writel(data, &ocotp_regs->hw_ocotp_data);
++
++ /* wait end of blowing process + 2us wrtie postamble*/
++ if (otp_error())
++ {
++ printf("OCOTP blow failed!\n");
++ err = -1;
++ }
++ udelay(2);
++
++ } else err = -1;
++
++
++ /*Â restore HBUS, CLKSEQ and VDDIO */
++ writel(vddio, &power_regs->hw_power_vddioctrl);
++ writel(hbus, &clkctrl_regs->hw_clkctrl_hbus);
++ writel(clkseq, &clkctrl_regs->hw_clkctrl_clkseq);
++
++ return err;
++}
++
++int otp_read_func(char *func_name)
++{
++ s32 err = 0;
++
++ if (0 == strncmp(func_name, "fecmac", 6)) {
++ s32 addr = func_name[6] -'0';
++
++ if ((addr >= 0) && (addr < 2)) {
++ /* Read the Mac address and print it */
++ u32 val = otp_read(addr);
++
++ printf("%s address: ", func_name);
++ printf("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n\n",
++ (ACFG_OUI>> 16) & 0xff, (ACFG_OUI>> 8) & 0xff,
++ (val >> 24) & 0xff, (val >> 16) & 0xff,
++ (val >> 8) & 0xff, val & 0xff);
++ } else {
++ printf("%s is not supported\n", func_name);
++ err = -1;
++ }
++ } else {
++ printf("%s is not supported\n", func_name);
++ err = -1;
++ }
++
++ return err;
++}
++
++int otp_blow_func(char *func_name, char *func_val)
++{
++ s32 err = 0;
++
++ if (0 == strncmp(func_name, "fecmac", 6)) {
++ s32 addr = func_name[6] -'0';
++
++ if ((addr >= 0) && (addr < 2)) {
++ u8 ea[6] = { 0 };
++ u32 macaddr;
++
++ eth_parse_enetaddr(func_val, ea);
++ if (!is_valid_ether_addr(ea)) {
++ printf("Error: invalid mac address!\n");
++ return -1;
++ }
++
++ macaddr = (ea[2] << 24) | (ea[3] << 16) |
++ (ea[4] << 8) | ea[5];
++
++ err = otp_blow(addr, macaddr);
++
++ } else {
++ printf("%s is not supported\n", func_name);
++ err = -1;
++ }
++ } else {
++ printf("%s is not supported\n", func_name);
++ err = -1;
++ }
++
++ return err;
++}
++
++
++int do_otpops(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
++{
++ int addr = 0, val = 0;
++
++ if (argc < 2 || argc > 4)
++ goto err_rtn;
++
++ if (strcmp(argv[1], "read") == 0) {
++ if (strncmp(argv[2], "fecmac", 6) == 0) {
++ if (3 == argc)
++ otp_read_func(argv[2]);
++ else
++ goto err_rtn;
++ } else {
++ if (3 == argc) {
++ addr = simple_strtoul(argv[2], NULL, 16);
++
++ printf("Read fuse at add: 0x%02x\n", addr);
++ val = otp_read(addr);
++ printf("fuses at (addr:0x%02x) = 0x%08x\n",
++ addr, val);
++ } else
++ goto err_rtn;
++ }
++ } else if (strcmp(argv[1], "blow") == 0) {
++ if (strncmp(argv[2], "fecmac", 6) == 0) {
++ if (4 == argc)
++ otp_blow_func(argv[2], argv[3]);
++ else
++ goto err_rtn;
++ } else {
++ if (4 == argc) {
++ addr = simple_strtoul(argv[2], NULL, 16);
++ val = simple_strtoul(argv[3], NULL, 16);
++
++ otp_blow(addr, val);
++ } else
++ goto err_rtn;
++ }
++ } else
++ goto err_rtn;
++
++ return 0;
++err_rtn:
++ printf("Invalid parameters!\n");
++ printf("It is too dangeous for you to use ocotp command.\n");
++ return 1;
++}
++
++U_BOOT_CMD(
++ ocotp, 4, 1, do_otpops,
++ "OCOTP sub system",
++ "Warning: all numbers in parameter are in hex format!\n"
++ "ocotp read <addr> - Read some fuses\n"
++ "ocotp read fecmac<n> - Read fecmac<n> MAC address\n"
++ "ocotp blow <addr> <value> - Blow some fuses\n"
++ "ocotp blow fecmac<n> <0x##:0x##:0x##:0x##:0x##:0x##> "
++ "- Blow fecmac<n> MAC address");
++
--- u-boot-2011.12/board/armadeus/apf28/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2011.12/board/armadeus/apf28/Makefile 2011-11-27 11:31:22.299138403 +0100
-@@ -0,0 +1,49 @@
++++ u-boot-2011.12/board/armadeus/apf28/Makefile 2012-02-07 01:39:18.114788951 +0100
+@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd...@de....
@@ -251,10 +531,12 @@
+
+ifndef CONFIG_SPL_BUILD
+COBJS := apf28.o
++COBJS-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
+else
+COBJS := spl_boot.o
+endif
+
++COBJS += $(COBJS-y)
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2012-02-06 16:15:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8e9c7abcdcce343f9fa47e39ecf1d26edce6b2c2 (commit)
via 211a63805dacb725f4df2c368f7d83da459843c3 (commit)
from 61a40fae286177d40721a4634c2fd360c293eed1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8e9c7abcdcce343f9fa47e39ecf1d26edce6b2c2
Merge: 211a638 61a40fa
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Feb 6 17:13:53 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 211a63805dacb725f4df2c368f7d83da459843c3
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Feb 6 17:12:44 2012 +0100
[BUILDROOT] Fix qmake path in Qwt Makefile.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2011.05/133-qwt-add_package.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/patches/buildroot/2011.05/133-qwt-add_package.patch b/patches/buildroot/2011.05/133-qwt-add_package.patch
index 6583c87..a931316 100644
--- a/patches/buildroot/2011.05/133-qwt-add_package.patch
+++ b/patches/buildroot/2011.05/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-08-08 12:16:09.000000000 +0200
-+++ buildroot/package/Config.in 2011-08-08 12:16:21.000000000 +0200
+--- buildroot.orig/package/Config.in 2012-02-06 17:00:50.000000000 +0100
++++ buildroot/package/Config.in 2012-02-06 17:05:03.000000000 +0100
@@ -134,6 +134,7 @@
comment "other GUIs"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/qwt/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/Config.in 2012-02-06 17:00:50.000000000 +0100
@@ -0,0 +1,20 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2012-02-06 17:00:50.000000000 +0100
@@ -0,0 +1,30 @@
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
Index: buildroot/package/qwt/qwt.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/qwt.mk 2012-02-06 17:06:49.000000000 +0100
@@ -0,0 +1,82 @@
+######################################################################
+#
@@ -92,7 +92,7 @@ Index: buildroot/package/qwt/qwt.mk
+QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
+QWT_CONFIG_FILE:=qwt.pro
+QWT_EXAMPLES_CONFIG_FILE:=examples.pro
-+QT_DIR:=$(STAGING_DIR)/usr
++QT_DIR:=$(HOST_DIR)/usr
+
+$(DL_DIR)/$(QWT_SOURCE):
+ $(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-06 14:55:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 61a40fae286177d40721a4634c2fd360c293eed1 (commit)
from 26d106a33f3c8b97192e1401b5edca7c2a91e35f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 61a40fae286177d40721a4634c2fd360c293eed1
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 6 15:55:24 2012 +0100
[BUILDROOT] Add gsmmux package
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2011.05/172-gsmmux-add_package.patch | 65 ++++++++++++++++++++
patches/buildroot/2011.05/cleanup_buildroot.sh | 1 +
2 files changed, 66 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2011.05/172-gsmmux-add_package.patch
diff --git a/patches/buildroot/2011.05/172-gsmmux-add_package.patch b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
new file mode 100644
index 0000000..8f24112
--- /dev/null
+++ b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
@@ -0,0 +1,65 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gsmmux/gsmmux.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gsmmux/gsmmux.mk 2012-02-06 15:51:44.000000000 +0100
+@@ -0,0 +1,31 @@
++#############################################################
++#
++# gsmmux
++#
++#############################################################
++
++GSMMUX_VERSION = 18
++GSMMUX_SITE = http://svn.berlios.de/svnroot/repos/gsmmux/trunk
++GSMMUX_SITE_METHOD = svn
++GSMMUX_BINARY = gsmMuxd
++GSMMUX_TARGET_DIR = $(TARGET_DIR)/usr/bin
++
++define GSMMUX_BUILD_CMDS
++ mkdir -p $(@D)/build
++ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
++ LD="$(TARGET_CC)" -C $(@D)
++endef
++
++define GSMMUX_INSTALL_TARGET_CMDS
++ cp $(@D)/build/$(GSMMUX_BINARY) $(GSMMUX_TARGET_DIR)
++endef
++
++define GSMMUX_CLEAN_CMDS
++ $(MAKE) -C $(@D) clean
++endef
++
++define GSMMUX_UNINSTALL_TARGET_CMDS
++ rm -f $(GSMMUX_TARGET_DIR)/$(GSMMUX_BINARY)
++endef
++
++$(eval $(call GENTARGETS,package,gsmmux))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-02-06 15:45:15.000000000 +0100
++++ buildroot/package/Config.in 2012-02-06 15:45:58.000000000 +0100
+@@ -338,6 +338,7 @@
+ #endif
+
+ menu "Networking"
++source "package/gsmmux/Config.in"
+ source "package/libcanfestival/Config.in"
+ source "package/libcgi/Config.in"
+ source "package/libcgicc/Config.in"
+Index: buildroot/package/gsmmux/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gsmmux/Config.in 2012-02-06 15:45:08.000000000 +0100
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_GSMMUX
++ bool "gsmmux"
++ help
++ GSM Multiplexer Daemon is intended to be used for GSM Modems.
++ It implements (a subset of) the GSM 07.10 standard, it can be used
++ to multiplex one or more logical channels over one physical serial
++ channel to the modem.
++
++ http://developer.berlios.de/projects/gsmmux/
diff --git a/patches/buildroot/2011.05/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
index a67af75..19d9b9d 100755
--- a/patches/buildroot/2011.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2011.05/cleanup_buildroot.sh
@@ -62,3 +62,4 @@ rm -rf buildroot/package/elftosb
rm -rf buildroot/package/rt-tests
rm -rf buildroot/package/libcanfestival
rm -rf buildroot/package/python
+rm -rf buildroot/package/gsmmux
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2012-02-06 12:01:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 26d106a33f3c8b97192e1401b5edca7c2a91e35f (commit)
via d2474eeb17b2233575426d166e32258f036b6854 (commit)
via 1cf1ab21a1ff1f095eefa1b40f92d60e75bcda91 (commit)
from efde8e25667e89bbd367ff7a98d82d763065b65c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 26d106a33f3c8b97192e1401b5edca7c2a91e35f
Merge: d2474ee efde8e2
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 6 13:00:40 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d2474eeb17b2233575426d166e32258f036b6854
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 6 13:00:04 2012 +0100
[LINUX] 2.6.35: Add (preliminary) support for APF28+APF28Dev
commit 1cf1ab21a1ff1f095eefa1b40f92d60e75bcda91
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 3 14:55:18 2012 +0100
[TOOLS] Add imxregs for APF28
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 1 +
buildroot/package/armadeus/imxregs/imxregs.mk | 48 +-
.../armadeus/apf28/apf28-linux-2.6.35.3.config | 1 +
.../apf28-linux-2.6.35.config} | 1264 +++++++++++---------
patches/linux/2.6.35.3 | 1 +
.../450-armadeus-add_apf28_module_support.patch | 378 ++++++
...1-armadeus-add_apf28dev_baseboard_support.patch | 939 +++++++++++++++
.../452-armadeus-mxs-fixes_freescale_bsp.patch | 78 ++
target/linux/debug/imxregs/Makefile | 8 +-
target/linux/debug/imxregs/imx28regs.h | 93 ++
target/linux/debug/imxregs/imxregs.c | 6 +-
11 files changed, 2192 insertions(+), 625 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.3.config
copy buildroot/target/device/armadeus/{apf51/apf51-linux-2.6.36.config => apf28/apf28-linux-2.6.35.config} (64%)
create mode 120000 patches/linux/2.6.35.3
create mode 100644 patches/linux/2.6.35/450-armadeus-add_apf28_module_support.patch
create mode 100644 patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
create mode 100644 patches/linux/2.6.35/452-armadeus-mxs-fixes_freescale_bsp.patch
create mode 100644 target/linux/debug/imxregs/imx28regs.h
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 95a4448..e4f1e6a 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -37,6 +37,7 @@ BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MTD=y
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index 0cabce1..2ce11f2 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -4,39 +4,25 @@
#
#############################################################
-IMXREGS_VER:=1.0
-IMXREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/imxregs/
-IMXREGS_DIR:=$(BUILD_DIR)/imxregs-$(IMXREGS_VER)
-IMXREGS_CAT:=zcat
-CPU_NAME=$(call qstrip,$(BR2_CPU_NAME))
-IMXREGS_BINARY:=$(CPU_NAME)regs
-IMXREGS_TARGET_BINARY:=usr/bin/imxregs
+IMXREGS_VERSION = 1.1
+IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
+IMXREGS_SITE_METHOD = copy
-$(IMXREGS_DIR)/imxregs.c:
- mkdir -p $(IMXREGS_DIR)/
- cp $(IMXREGS_SOURCE)/* $(IMXREGS_DIR)/
+CPU_NAME = $(call qstrip,$(BR2_CPU_NAME))
+IMXREGS_BINARY = $(CPU_NAME)regs
+IMXREGS_TARGET_BINARY = $(TARGET_DIR)/usr/bin/imxregs
-$(IMXREGS_DIR)/$(IMXREGS_BINARY): $(IMXREGS_DIR)/imxregs.c
- $(MAKE) CC="$(TARGET_CC)" -C $(IMXREGS_DIR)
+define IMXREGS_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
-$(TARGET_DIR)/$(IMXREGS_TARGET_BINARY): $(IMXREGS_DIR)/$(IMXREGS_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
+define IMXREGS_INSTALL_TARGET_CMDS
+ install -D $(@D)/$(IMXREGS_BINARY) $(IMXREGS_TARGET_BINARY)
+endef
-imxregs: $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
+define IMXREGS_CLEAN_CMDS
+ rm -f $(IMXREGS_TARGET_BINARY)
+ $(MAKE) -C $(@D) clean
+endef
-imxregs-clean:
- rm -f $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
- -$(MAKE) -C $(IMXREGS_DIR) clean
-
-imxregs-dirclean:
- rm -rf $(IMXREGS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_IMXREGS)),y)
-TARGETS+=imxregs
-endif
+$(eval $(call GENTARGETS,package/armadeus,imxregs))
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.3.config
new file mode 120000
index 0000000..6b66b41
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.3.config
@@ -0,0 +1 @@
+apf28-linux-2.6.35.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
similarity index 64%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 3c76717..4974b27 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,11 +1,12 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36
-# Wed Dec 1 17:27:05 2010
+# Linux kernel version: 2.6.35.3
+# Fri Feb 3 12:55:29 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_HAVE_PROC_CPU=y
@@ -17,11 +18,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_FIQ=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y
@@ -35,21 +38,23 @@ CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_LZO=y
CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
+CONFIG_AUDIT=y
#
# RCU Subsystem
@@ -62,16 +67,26 @@ CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=17
# CONFIG_CGROUPS is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
+# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
@@ -87,6 +102,7 @@ CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
+# CONFIG_ASHMEM is not set
CONFIG_AIO=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
@@ -97,23 +113,25 @@ CONFIG_PERF_USE_VMALLOC=y
CONFIG_PERF_EVENTS=y
# CONFIG_PERF_COUNTERS is not set
CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
+CONFIG_OPROFILE=m
CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
#
# GCOV-based kernel profiling
#
# CONFIG_GCOV_KERNEL is not set
+# CONFIG_SLOW_WORK is not set
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -122,11 +140,11 @@ CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_BLOCK=y
CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_INTEGRITY is not set
#
@@ -134,10 +152,11 @@ CONFIG_LBDAF=y
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_IOSCHED="cfq"
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
# CONFIG_INLINE_SPIN_LOCK is not set
@@ -186,8 +205,9 @@ CONFIG_MMU=y
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
-CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_STMP3XXX is not set
+CONFIG_ARCH_MXS=y
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_IOP13XX is not set
@@ -196,10 +216,10 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
# CONFIG_ARCH_DOVE is not set
# CONFIG_ARCH_KIRKWOOD is not set
# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_LPC32XX is not set
# CONFIG_ARCH_MV78XX0 is not set
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_MMP is not set
@@ -207,7 +227,6 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCH_NUC93X is not set
-# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_MSM is not set
@@ -220,7 +239,6 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_S5P6442 is not set
# CONFIG_ARCH_S5PC100 is not set
# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_S5PV310 is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_U300 is not set
@@ -229,47 +247,56 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
-
-#
-# Freescale MXC Implementations
-#
-# CONFIG_ARCH_MX1 is not set
-# CONFIG_ARCH_MX2 is not set
-# CONFIG_ARCH_MX25 is not set
-# CONFIG_ARCH_MX3 is not set
-# CONFIG_ARCH_MXC91231 is not set
-CONFIG_ARCH_MX5=y
-CONFIG_ARCH_MX51=y
-
-#
-# MX5 platforms:
-#
-# CONFIG_MACH_MX51_BABBAGE is not set
-# CONFIG_MACH_MX51_3DS is not set
-# CONFIG_MACH_EUKREA_CPUIMX51 is not set
-CONFIG_MACH_APF51=y
-CONFIG_MACH_APF51_HAS_BASEBOARD=y
-CONFIG_MACH_APF51_DEV=y
-# CONFIG_MXC_IRQ_PRIOR is not set
-CONFIG_MXC_TZIC=y
-# CONFIG_MXC_PWM is not set
-# CONFIG_MXC_DEBUG_BOARD is not set
-CONFIG_MXC_ULPI=y
-CONFIG_ARCH_MXC_IOMUX_V3=y
+CONFIG_IRAM_ALLOC=y
+CONFIG_DMA_ZONE_SIZE=16
+
+#
+# Freescale i.MXS implementations
+#
+CONFIG_ARCH_MX28=y
+# CONFIG_ARCH_MX23 is not set
+# CONFIG_MACH_MX28EVK is not set
+CONFIG_MACH_APF28=y
+CONFIG_MACH_APF28_HAS_BASEBOARD=y
+CONFIG_MACH_APF28DEV=y
+CONFIG_VECTORS_PHY_ADDR=0
+CONFIG_MXS_TIMER_WITH_MACH=y
+# CONFIG_MEM_mDDR is not set
+CONFIG_MXS_ICOLL=y
+CONFIG_MXS_EARLY_CONSOLE=y
+CONFIG_MXS_DMA_ENGINE=y
+CONFIG_MXS_LRADC=y
+CONFIG_MXS_PWM_CHANNELS=8
+
+#
+# Freescale Application UART:
+#
+CONFIG_MXS_AUART_DMA_SUPPORT=y
+CONFIG_MXS_AUART_PORTS=5
+CONFIG_MXS_AUART0_DEVICE_ENABLE=y
+# CONFIG_MXS_AUART0_DMA_ENABLE is not set
+CONFIG_MXS_AUART1_DEVICE_ENABLE=y
+# CONFIG_MXS_AUART1_DMA_ENABLE is not set
+CONFIG_MXS_AUART2_DEVICE_ENABLE=y
+# CONFIG_MXS_AUART2_DMA_ENABLE is not set
+CONFIG_MXS_AUART3_DEVICE_ENABLE=y
+# CONFIG_MXS_AUART3_DMA_ENABLE is not set
+CONFIG_MXS_AUART4_DEVICE_ENABLE=y
+# CONFIG_MXS_AUART4_DMA_ENABLE is not set
+CONFIG_MXS_RAM_FREQ_SCALING=y
+# CONFIG_MXS_RAM_MDDR is not set
+# CONFIG_MXS_RAM_DDR is not set
#
# Processor Type
#
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
@@ -277,17 +304,11 @@ CONFIG_CPU_CP15_MMU=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-CONFIG_ARM_THUMBEE=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_CPU_HAS_PMU=y
-# CONFIG_ARM_ERRATA_430973 is not set
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
CONFIG_COMMON_CLKDEV=y
#
@@ -312,48 +333,56 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_HZ=100
-# CONFIG_THUMB2_KERNEL is not set
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
-CONFIG_HW_PERF_EVENTS=y
-# CONFIG_SPARSE_IRQ is not set
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_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTLOCK_CPUS=999999
# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_CC_STACKPROTECTOR is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
#
# Boot options
#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
-# CONFIG_AUTO_ZRELADDR is not set
#
# CPU Power Management
#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_IDLE is not set
#
# Floating point emulation
@@ -364,9 +393,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
#
# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
+# CONFIG_VFP is not set
#
# Userspace binary formats
@@ -375,23 +402,19 @@ CONFIG_BINFMT_ELF=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_HAVE_AOUT=y
# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=y
#
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
-CONFIG_PM_VERBOSE=y
-CONFIG_CAN_PM_TRACE=y
+# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
-# CONFIG_PM_RUNTIME is not set
+CONFIG_PM_RUNTIME=y
CONFIG_PM_OPS=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -412,8 +435,8 @@ CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
@@ -424,38 +447,20 @@ CONFIG_IP_PNP=y
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
# CONFIG_NETFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
@@ -478,72 +483,47 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IEEE802154 is not set
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
+CONFIG_CAN=y
+CONFIG_CAN_RAW=y
+# CONFIG_CAN_BCM is not set
+
+#
+# CAN Device Drivers
+#
+# CONFIG_CAN_VCAN is not set
+# CONFIG_CAN_DEV is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_FLEXCAN=m
# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_ATH3K is not set
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_ATH3K is not set
+# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_WEXT_SPY=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
+CONFIG_WEXT_PRIV=y
+# CONFIG_CFG80211 is not set
CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
+
+#
+# Some wireless drivers require a rate control algorithm
+#
# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
@@ -555,10 +535,11 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
+CONFIG_FW_LOADER=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE=""
# CONFIG_SYS_HYPERVISOR is not set
@@ -566,7 +547,7 @@ CONFIG_EXTRA_FIRMWARE=""
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
@@ -616,7 +597,9 @@ CONFIG_MTD_CFI_I2=y
# Self-contained MTD device drivers
#
# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_MXC_DATAFLASH is not set
+CONFIG_MTD_M25P80=m
+CONFIG_M25PXX_USE_FAST_READ=y
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
@@ -635,13 +618,14 @@ CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
# CONFIG_MTD_NAND_GPIO is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set
+CONFIG_MTD_NAND_GPMI_NFC=y
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not set
-CONFIG_MTD_NAND_MXC=y
# CONFIG_MTD_ONENAND is not set
#
@@ -661,17 +645,22 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
# UBI debugging options
#
# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_MTD_UBI_BLOCK=y
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
#
# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
#
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
@@ -681,18 +670,18 @@ CONFIG_MISC_DEVICES=y
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_ISL29003 is not set
# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1780 is not set
-# CONFIG_HMC6352 is not set
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
-# CONFIG_BMP085 is not set
+CONFIG_MXS_PERSISTENT=y
+# CONFIG_ANDROID_PMEM is not set
+# CONFIG_UID_STAT is not set
# CONFIG_C2PORT is not set
#
# EEPROM support
#
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
@@ -708,36 +697,35 @@ CONFIG_SCSI_MOD=y
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
# CONFIG_LIBFC is not set
# CONFIG_LIBFCOE is not set
# CONFIG_SCSI_DEBUG is not set
@@ -763,7 +751,7 @@ CONFIG_PHYLIB=y
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
-CONFIG_SMSC_PHY=y
+# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
@@ -791,43 +779,28 @@ CONFIG_MII=y
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
# CONFIG_B44 is not set
+# CONFIG_KS8842 is not set
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
CONFIG_FEC=y
+# CONFIG_FEC_1588 is not set
# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_AT76C50X_USB is not set
# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_ATH_COMMON is not set
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
# CONFIG_HOSTAP is not set
-# CONFIG_IWM is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_USB is not set
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_MESH is not set
-# CONFIG_P54_COMMON is not set
-CONFIG_RT2X00=m
-# CONFIG_RT2500USB is not set
-CONFIG_RT73USB=m
-# CONFIG_RT2800USB is not set
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-# CONFIG_RT2X00_DEBUG is not set
-# CONFIG_WL12XX is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_ATH6K_LEGACY=m
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+# CONFIG_ATH6KL_CFG80211 is not set
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_DEBUG is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -841,12 +814,9 @@ CONFIG_ZD1211RW=m
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
+# CONFIG_USB_HSO is not set
# CONFIG_USB_IPHETH is not set
# CONFIG_WAN is not set
-
-#
-# CAIF transport drivers
-#
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_NETCONSOLE is not set
@@ -859,7 +829,7 @@ CONFIG_ZD1211RW=m
# Input device support
#
CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=y
# CONFIG_INPUT_POLLDEV is not set
# CONFIG_INPUT_SPARSEKMAP is not set
@@ -870,7 +840,7 @@ CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
@@ -885,36 +855,44 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-CONFIG_KEYBOARD_IMX=m
# 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=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# 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
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_KEYBOARD_MXS=m
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+# CONFIG_JOYSTICK_XPAD is not set
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_ADS7846 is not set
# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
# CONFIG_TOUCHSCREEN_DYNAPRO is not set
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
# CONFIG_TOUCHSCREEN_EETI is not set
@@ -926,8 +904,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
+CONFIG_TOUCHSCREEN_MXS=m
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_QT602240 is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -946,8 +924,6 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-# CONFIG_INPUT_WM831X_ON is not set
-# CONFIG_INPUT_ADXL34X is not set
#
# Hardware I/O ports
@@ -968,8 +944,13 @@ CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_DEVKMEM=y
-# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_N_HDLC is not set
# CONFIG_N_GSM is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+CONFIG_STALDRV=y
+CONFIG_MXS_VIIM=y
#
# Serial drivers
@@ -979,10 +960,11 @@ CONFIG_DEVKMEM=y
#
# Non-8250 serial port support
#
+CONFIG_SERIAL_MXS_DUART=y
+CONFIG_SERIAL_MXS_AUART=y
+# CONFIG_SERIAL_MXS_AUART_CONSOLE is not set
+CONFIG_SERIAL_MXS_DUART_CONSOLE=y
# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX3107 is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
@@ -990,18 +972,26 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_ALTERA_UART is not set
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 is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_FSL_OTP is not set
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
+CONFIG_RAW_DRIVER=y
+CONFIG_MAX_RAW_DEVS=8192
# CONFIG_TCG_TPM is not set
# CONFIG_RAMOOPS is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_MUX is not set
+# CONFIG_I2C_CHARDEV is not set
CONFIG_I2C_HELPER_AUTO=y
#
@@ -1013,7 +1003,10 @@ CONFIG_I2C_HELPER_AUTO=y
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_MXS=y
+CONFIG_I2C_MXS_SELECT0=y
+# CONFIG_I2C_MXS_SELECT0_PIOQUEUE_MODE is not set
+# CONFIG_I2C_MXS_SELECT1 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_SIMTEC is not set
@@ -1034,16 +1027,15 @@ CONFIG_I2C_HELPER_AUTO=y
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
-CONFIG_SPI_BITBANG=y
+# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_IMX=y
# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_MXS=y
# CONFIG_SPI_DESIGNWARE is not set
#
@@ -1058,8 +1050,7 @@ CONFIG_SPI_IMX=y
# CONFIG_PPS is not set
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
@@ -1073,8 +1064,6 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SX150X is not set
-# CONFIG_GPIO_WM831X is not set
# CONFIG_GPIO_ADP5588 is not set
#
@@ -1096,96 +1085,18 @@ CONFIG_GPIOLIB=y
# MODULbus GPIO expanders:
#
# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
# CONFIG_TEST_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_VID is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADS7871 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_WM831X is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
+CONFIG_BATTERY_MXS=y
+# CONFIG_MXS_VBUS_CURRENT_DRAW is not set
+# CONFIG_BATTERY_DS2438 is not set
+# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1194,9 +1105,8 @@ CONFIG_WATCHDOG=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_WM831X_WATCHDOG is not set
+CONFIG_MXS_WATCHDOG=y
# CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_IMX2_WDT=m
#
# USB-based Watchdog Cards
@@ -1207,9 +1117,12 @@ CONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#
-# CONFIG_SSB is not set
+CONFIG_SSB=m
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_DEBUG is not set
CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=y
+# CONFIG_MFD_CORE is not set
# CONFIG_MFD_88PM860X is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -1219,7 +1132,6 @@ CONFIG_MFD_CORE=y
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_TC35892 is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
@@ -1228,33 +1140,170 @@ CONFIG_MFD_CORE=y
# CONFIG_PMIC_DA903X is not set
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_WM8400 is not set
-CONFIG_MFD_WM831X=y
+# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_LTC3589_I2C is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_MFD_MC13783 is not set
# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_AB8500_CORE is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MFD_MAX17135 is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_MXS=y
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=y
+
+#
+# Multimedia drivers
+#
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+# CONFIG_IR_IMON is not set
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=y
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_DMA_CONTIG=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_CX25840 is not set
+
+#
+# MPEG video encoders
+#
+# CONFIG_VIDEO_CX2341X is not set
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_AK881X is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+CONFIG_VIDEO_MXS_PXP=y
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_DAB is not set
#
# Graphics support
#
-# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=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 is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_COPYAREA is not set
@@ -1270,25 +1319,23 @@ CONFIG_FB=y
#
# Frame buffer hardware drivers
#
+CONFIG_FB_MXS=y
+# CONFIG_FB_MXS_LCD_43WVF1G is not set
+# CONFIG_FB_MXS_LCD_LMS430 is not set
+CONFIG_FB_MXS_LCD_TM035=y
+CONFIG_FB_MXS_LCD_LW700=y
+# CONFIG_FB_MXS_TVENC is not set
# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_TMIO is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_S6E63M0 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
-# CONFIG_BACKLIGHT_WM831X is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
+CONFIG_BACKLIGHT_MXS=y
#
# Display device support
@@ -1298,61 +1345,19 @@ CONFIG_BACKLIGHT_GENERIC=m
#
# Console display driver support
#
+# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
+# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_8x16=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_ARMADEUS_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
+# CONFIG_SOUND is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HIDRAW is not set
@@ -1362,70 +1367,76 @@ CONFIG_HID=y
#
CONFIG_USB_HID=y
# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDDEV=y
#
# Special HID drivers
#
# CONFIG_HID_3M_PCT is not set
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX_FF is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
# CONFIG_HID_CANDO is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_DRAGONRISE=y
+# CONFIG_DRAGONRISE_FF is not set
# CONFIG_HID_EGALAX is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_GYRATION is not set
+CONFIG_HID_EZKEY=y
+CONFIG_HID_KYE=y
+CONFIG_HID_GYRATION=y
# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LOGITECH=y
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGIG940_FF is not set
+CONFIG_HID_MICROSOFT=y
# CONFIG_HID_MOSART is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
+CONFIG_HID_MONTEREY=y
+CONFIG_HID_NTRIG=y
# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
+CONFIG_HID_PANTHERLORD=y
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=y
# CONFIG_HID_PICOLCD is not set
# CONFIG_HID_QUANTA is not set
# CONFIG_HID_ROCCAT is not set
# CONFIG_HID_ROCCAT_KONE is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
# CONFIG_HID_STANTUM is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_SUNPLUS=y
+CONFIG_HID_GREENASIA=y
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=y
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TOPSEED=y
+CONFIG_HID_THRUSTMASTER=y
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_ZEROPLUS=y
+# CONFIG_ZEROPLUS_FF is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
#
# Miscellaneous USB options
#
-CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICEFS is not set
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_MON=y
+# CONFIG_USB_MON is not set
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
@@ -1434,9 +1445,16 @@ CONFIG_USB_MON=y
#
# CONFIG_USB_C67X00_HCD is not set
CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ARC=y
+CONFIG_USB_EHCI_ARC_H1=y
+CONFIG_USB_EHCI_ARC_OTG=y
+# CONFIG_USB_STATIC_IRAM is not set
+# CONFIG_USB_EHCI_FSL_MC13783 is not set
+# CONFIG_USB_EHCI_FSL_1301 is not set
+# CONFIG_USB_EHCI_FSL_1504 is not set
+CONFIG_USB_EHCI_FSL_UTMI=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_MXC=y
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
@@ -1445,13 +1463,14 @@ CONFIG_USB_EHCI_MXC=y
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
#
# USB Device Class drivers
#
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
#
@@ -1510,42 +1529,64 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_GADGET_FSL_USB2=y
-CONFIG_USB_FSL_USB2=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C_HSOTG is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+CONFIG_USB_GADGET_ARC=y
+CONFIG_USB_ARC=y
+CONFIG_WORKAROUND_ARCUSB_REG_RW=y
+# CONFIG_USB_GADGET_LANGWELL is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_FSL_UTP is not set
+# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
# CONFIG_USB_G_MULTI is not set
# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
#
# OTG and related infrastructure
#
+CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ULPI is not set
# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MXC_OTG=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
#
# MMC/SD/SDIO Card Drivers
@@ -1559,10 +1600,26 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# MMC/SD/SDIO Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
-CONFIG_MMC_MXC=y
# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_IMX_ESDHCI_PIO_MODE is not set
+# CONFIG_MMC_MXS is not set
# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_MXS=y
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_TRIGGERS is not set
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1583,13 +1640,11 @@ CONFIG_RTC_INTF_DEV=y
# I2C RTC drivers
#
# CONFIG_RTC_DRV_DS1307 is not set
-CONFIG_RTC_DRV_DS1374=y
+# CONFIG_RTC_DRV_DS1374 is not set
# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS3232 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
@@ -1625,16 +1680,22 @@ CONFIG_RTC_DRV_DS1374=y
# CONFIG_RTC_DRV_M48T35 is not set
# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_MSM6242 is not set
-CONFIG_RTC_MXC=m
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_WM831X=m
#
# on-CPU RTC drivers
#
-# CONFIG_DMADEVICES is not set
+CONFIG_RTC_DRV_MXS=y
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+# CONFIG_MXC_PXP is not set
+# CONFIG_TIMB_DMA is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
@@ -1646,14 +1707,13 @@ CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
+# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
# CONFIG_EXT4_FS is not set
-CONFIG_FS_XIP=y
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
@@ -1668,10 +1728,18 @@ CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
+# CONFIG_INOTIFY is not set
CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
# CONFIG_FUSE_FS is not set
#
@@ -1685,7 +1753,8 @@ CONFIG_AUTOFS4_FS=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
-# CONFIG_UDF_FS is not set
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
@@ -1694,7 +1763,7 @@ CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
# CONFIG_NTFS_FS is not set
#
@@ -1707,7 +1776,7 @@ CONFIG_SYSFS=y
CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
@@ -1717,54 +1786,43 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_CMODE_NONE=y
-# CONFIG_JFFS2_CMODE_PRIORITY is not set
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_FS is not set
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_XATTR is not set
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
CONFIG_UBIFS_FS_LZO=y
CONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_FS_DEBUG is not set
# CONFIG_LOGFS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
+CONFIG_CRAMFS=y
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_XATTRS is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_V4 is not set
CONFIG_ROOT_NFS=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
# CONFIG_NFSD is not set
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
# CONFIG_CEPH_FS is not set
@@ -1778,70 +1836,70 @@ CONFIG_RPCSEC_GSS_KRB5=y
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
+CONFIG_OSF_PARTITION=y
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
+CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
+CONFIG_SGI_PARTITION=y
# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
+CONFIG_SUN_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
+CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=y
-# 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=y
-# 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_...
[truncated message content] |
