armadeus-commitlog Mailing List for armadeus (Page 112)
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: Gwenhael <gwe...@us...> - 2010-02-15 16:41: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 1d779c611fbcc6c3955948eea250e1bee814abb2 (commit)
from fe6d2e5cc9121fd59bf49fcda18f226fa0db0bee (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 1d779c611fbcc6c3955948eea250e1bee814abb2
Author: gwenhael <gwe...@us...>
Date: Mon Feb 15 17:39:50 2010 +0100
[XENOMAI][PACKAGE] Renamed patch for distinguish if it need before or after adeos and Xenomai modifications
-----------------------------------------------------------------------
Summary of changes:
...before-adeos-compatibility_with_armadeus.patch} | 0
...ze_on_mxc_with_gpio_generated_interrupts.patch} | 0
buildroot/package/xenomai/xenomai.mk | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename buildroot/package/xenomai/{00-adeos-compatibility_with_armadeus.patch => 00-before-adeos-compatibility_with_armadeus.patch} (100%)
rename buildroot/package/xenomai/{01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch => 01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch} (100%)
diff --git a/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch b/buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
similarity index 100%
rename from buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
rename to buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
diff --git a/buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch b/buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
similarity index 100%
rename from buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
rename to buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
index e7f8fb1..cf266a2 100644
--- a/buildroot/package/xenomai/xenomai.mk
+++ b/buildroot/package/xenomai/xenomai.mk
@@ -43,14 +43,14 @@ $(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 01-adeos-\*.patch
+ \*-before-adeos-\*.patch
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX26_DIR) \
--arch=$(BR2_ARCH) \
--default
cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- 02-adeos-\*.patch
+ \*-after-adeos-\*.patch
touch $@
xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
hooks/post-receive
--
armadeus
|
|
From: Gwenhael <gwe...@us...> - 2010-02-15 16:20: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 fe6d2e5cc9121fd59bf49fcda18f226fa0db0bee (commit)
from 4d19d15fa070b7b5b0c37570ac1f6651e33ce416 (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 fe6d2e5cc9121fd59bf49fcda18f226fa0db0bee
Author: gwenhael <gwe...@us...>
Date: Mon Feb 15 17:18:25 2010 +0100
[XENOMAI][PACKAGE] Patch to prevent System freeze on mxc with gpio generated interrupts
-----------------------------------------------------------------------
Summary of changes:
...eze_on_mxc_with_gpio_generated_interrupts.patch | 23 ++++++++++++++++++++
buildroot/package/xenomai/xenomai.mk | 4 ++-
2 files changed, 26 insertions(+), 1 deletions(-)
create mode 100644 buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
diff --git a/buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch b/buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
new file mode 100644
index 0000000..229aa1c
--- /dev/null
+++ b/buildroot/package/xenomai/01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
+
+Signed-off-by: Gwenhael GOAVEC-MEROU <gw...@tr...>
+
+Index: kernel/arch/arm/plat-mxc/gpio.c
+===================================================================
+--- a/arch/arm/plat-mxc/gpio.c 2009-12-17 22:09:56.000000000 +0100
++++ b/arch/arm/plat-mxc/gpio.c 2009-12-17 15:45:17.000000000 +0100
+@@ -241,11 +241,11 @@
+ int i;
+
+ for (i = 0; i < gpio_table_size; i++) {
+- irq_msk = __raw_readl(port->base + GPIO_IMR);
++ irq_msk = __raw_readl(port[i].base + GPIO_IMR);
+ if (!irq_msk)
+ continue;
+
+- irq_stat = __raw_readl(port->base + GPIO_ISR) & irq_msk;
++ irq_stat = __raw_readl(port[i].base + GPIO_ISR) & irq_msk;
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
index 5f88662..e7f8fb1 100644
--- a/buildroot/package/xenomai/xenomai.mk
+++ b/buildroot/package/xenomai/xenomai.mk
@@ -43,12 +43,14 @@ $(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- \*-adeos-\*.patch
+ 01-adeos-\*.patch
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX26_DIR) \
--arch=$(BR2_ARCH) \
--default
cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 02-adeos-\*.patch
touch $@
xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-15 10:27:13
|
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 4d19d15fa070b7b5b0c37570ac1f6651e33ce416 (commit)
via ebd7f779abf1ac942d5cd8b2c8576dd1c04a9912 (commit)
from 917d61ed60d7a2745aee027a277acd8453b7b100 (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 4d19d15fa070b7b5b0c37570ac1f6651e33ce416
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 15 11:24:44 2010 +0100
[DEMOS] Updates real_time/Makefile.in
commit ebd7f779abf1ac942d5cd8b2c8576dd1c04a9912
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 15 11:22:26 2010 +0100
[BUILD] Add ARMADEUS_XENOMAI_DIR envt variable
-----------------------------------------------------------------------
Summary of changes:
Makefile | 1 +
Makefile.in | 2 ++
target/demos/real_time/Makefile.in | 26 ++++++++++++--------------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 3375976..549f0eb 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,7 @@ shell_env:
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
diff --git a/Makefile.in b/Makefile.in
index c3910b1..dbcfa67 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/
ifeq ($(ARMADEUS_SDL_VERSION),)
ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
endif
+ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
ARMADEUS_PATCH_DIR=patches
ifeq ($(BR2_VERSION),"0.10.0-svn")
@@ -56,4 +57,5 @@ ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+ARMADEUS_XENOMAI_DIR:=$(ARMADEUS_BUILD_DIR)/xenomai-$(ARMADEUS_XENOMAI_VERSION)
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index 3728d35..c4cf0de 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -2,15 +2,14 @@
DEST_DIR=/tftpboot/local/bin
include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-CC= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-LD= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
-CXX= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-AS= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
-NM= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
-AR= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
-SIZE= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
-OBJCOPY= $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+LD:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
+CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+AS:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
+NM:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
+AR:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
+SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
+OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
EXEC=$(APPLICATIONS)
@@ -28,9 +27,10 @@ endif
$(EXEC) : $(OBJ)
$(CC) -o $@ $^ $(LDFLAGS)
+
$(OBJ): $(SRC)
$(CC) $(CFLAGS) -o $@ -c $<
-.PHONY: install
+
ifeq ($(XENOMAI),y)
install: $(EXEC)
mkdir -p $(DEST_DIR)/$(EXEC)
@@ -58,21 +58,19 @@ CLEAN_MOD+= .tmp_versions Module.markers
$(EXEC): $(MODULES).c
$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
-.PHONY: install
install: $(EXEC)
cp $(EXEC) $(DEST_DIR)/$(EXEC)
endif
-.PHONY: all
all: $(EXEC)
-.PHONY: clean
clean:
rm -rf $(OBJ) $(CLEAN_MOD)
rm -f $(EXEC)
rm -f *.c~ *.h~ Makefile~
-.PHONY: mrproper
mrproper: clean
rm -rf $(DEST_DIR)/$(EXEC)
+.PHONY: all install clean mrproper
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-15 09:04: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 917d61ed60d7a2745aee027a277acd8453b7b100 (commit)
from 771872735971272857069582eb36aed183c65015 (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 917d61ed60d7a2745aee027a277acd8453b7b100
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 15 10:03:35 2010 +0100
Updates cleanup_buildroot.sh
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/cleanup_buildroot.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 692a240..4792d53 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -14,3 +14,4 @@ rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/audio/flite/
rm -rf buildroot/package/libcurl/
rm -f buildroot/package/audio/madplay/madplay-audio-alsa.patch
+rm -f buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-12 10:37: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 771872735971272857069582eb36aed183c65015 (commit)
via a291b08a1667b1e6347c4f3efae69daccfd9569e (commit)
via b098a787a6c154cf68814cf47412fd2f2d3df10a (commit)
via a5d6e85f0f3d1794e5b13aed945ce685e58455d2 (commit)
via 0c41d8768f45d1189ea2251058b6a381f06f59b9 (commit)
via ce1530321cc9f5b546e8a0a0dd01289bdbf1aadb (commit)
from ac1dc3aa6157acaf797cfa640dbee0bc00a3e261 (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 771872735971272857069582eb36aed183c65015
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 12 11:02:48 2010 +0100
[BUILDROOT] [2010.02] Add fixes to correctly build rsync and alsamixer
commit a291b08a1667b1e6347c4f3efae69daccfd9569e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 12 10:35:10 2010 +0100
[BUILDROOT] [2010.02] Updates apf27_defconfig
commit b098a787a6c154cf68814cf47412fd2f2d3df10a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:30:04 2010 +0100
Updates buildroot/.gitignore
commit a5d6e85f0f3d1794e5b13aed945ce685e58455d2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:28:50 2010 +0100
[TOOLS] Improves quiltify.sh for new BR handling and modify main Makefile accordingly
commit 0c41d8768f45d1189ea2251058b6a381f06f59b9
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:25:22 2010 +0100
[BUILDROOT] [2010.02] Updates apf27_defconfig
commit ce1530321cc9f5b546e8a0a0dd01289bdbf1aadb
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:24:12 2010 +0100
[BUILDROOT] Moves buildroot/package/audio/madplay/madplay-audio-alsa.patch as a BR patch
-----------------------------------------------------------------------
Summary of changes:
Makefile | 15 +-
buildroot/.gitignore | 3 +
buildroot/configs/apf27_defconfig | 23 ++-
.../package/audio/madplay/madplay-audio-alsa.patch | 172 ------------------
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++++++++++++++++++
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++++++++++++++++++
...pdates_source_repository_and_bump_version.patch | 32 ++++
...libform_libmenu_and_libpanel_from_ncurses.patch | 36 ++++
patches/buildroot/2010.02/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 2 +-
scripts/quiltify.sh | 2 +-
11 files changed, 469 insertions(+), 191 deletions(-)
delete mode 100644 buildroot/package/audio/madplay/madplay-audio-alsa.patch
create mode 100644 patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
create mode 100644 patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
diff --git a/Makefile b/Makefile
index 592a7a3..3375976 100644
--- a/Makefile
+++ b/Makefile
@@ -23,27 +23,25 @@
#--------------------------------------------------------------
include ./Makefile.in
+ARMADEUS_TOPDIR:=$(shell pwd)
+export ARMADEUS_TOPDIR
#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
#BUILDROOT_VERSION:=20100211
-#BUILDROOT_PATCH_DIR = patches/buildroot/2010.02
+#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
-BUILDROOT_PATCH_DIR = patches/buildroot
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
-
-ARMADEUS_TOPDIR:=$(shell pwd)
-export ARMADEUS_TOPDIR
-
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
-BUILDROOT_DIR = buildroot
+#BUILDROOT_DIR is defined in ./Makefile.in
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore -xf
-ARMADEUS_ENV_FILE=armadeus_env.sh
+ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
@@ -186,6 +184,7 @@ buildroot-dirclean:
# Generate shell's most useful variables:
shell_env:
@echo ARMADEUS_BUILDROOT_DIR=$(BUILDROOT_DIR) > $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
diff --git a/buildroot/.gitignore b/buildroot/.gitignore
index 0cf1f5b..ac6d14b 100644
--- a/buildroot/.gitignore
+++ b/buildroot/.gitignore
@@ -3,6 +3,7 @@
/build_*
/dl
/docs/
+/output/
/project_*
/project/
/toolchain_*
@@ -13,6 +14,8 @@
/Config.in
/Makefile
/TODO
+/CHANGES
+/COPYING
*.depend
*.o
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index fbfb306..58b647f 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Tue Feb 9 11:51:05 2010
+# Thu Feb 11 12:18:28 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.02-git"
+BR2_VERSION="2010.02-rc1"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -92,7 +92,7 @@ BR2_GIT="git clone"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
-BR2_DL_DIR="/local/downloads"
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_COPYTO=""
#
@@ -495,8 +495,6 @@ BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
-# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
# MTD tools selection
@@ -526,6 +524,17 @@ BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_RFDFORMAT is not set
# BR2_PACKAGE_MTD_SERVE_IMAGE is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIFORMAT=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBINIZE=y
+BR2_PACKAGE_MTD_UBIRENAME=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIRSVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
@@ -577,10 +586,6 @@ BR2_PACKAGE_ALSA_UTILS_ARECORD=y
# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-
-#
-# asterisk - disabled (required openssl and mpg123)
-#
# BR2_PACKAGE_AUMIX is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_GSTREAMER is not set
diff --git a/buildroot/package/audio/madplay/madplay-audio-alsa.patch b/buildroot/package/audio/madplay/madplay-audio-alsa.patch
deleted file mode 100644
index 0647dba..0000000
--- a/buildroot/package/audio/madplay/madplay-audio-alsa.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-* needed for madplay to compile when ALSA is configured with
- --with-versioned=no option.
-* fix allocation of buffer, buffer_size is number of frames
-* use default 16 bit depth (some hardware has small buffers, 16/24 bit
- difference is very small)
-
---- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
-+++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
-@@ -28,31 +28,30 @@
-
- #include <errno.h>
-
--#define ALSA_PCM_OLD_HW_PARAMS_API
--#define ALSA_PCM_OLD_SW_PARAMS_API
- #include <alsa/asoundlib.h>
-
- #include <mad.h>
-
- #include "audio.h"
-
--char *buf = NULL;
--int paused = 0;
-+#define BUFFER_TIME_MAX 500000
-+unsigned char *buf = NULL;
-+int paused = 0;
-+
-+unsigned int rate = 0;
-+unsigned int channels = -1;
-+unsigned int bitdepth = -1;
-+unsigned int sample_size= -1;
-
--int rate = -1;
--int channels = -1;
--int bitdepth = -1;
--int sample_size = -1;
--
--int buffer_time = 500000;
--int period_time = 100000;
-+unsigned int buffer_time;
-+unsigned int period_time;
- char *defaultdev = "plughw:0,0";
-
- snd_pcm_hw_params_t *alsa_hwparams;
- snd_pcm_sw_params_t *alsa_swparams;
-
- snd_pcm_sframes_t buffer_size;
--snd_pcm_sframes_t period_size;
-+snd_pcm_uframes_t period_size;
-
- snd_pcm_format_t alsa_format = -1;
- snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-@@ -66,7 +65,7 @@
- snd_pcm_hw_params_t *params,
- snd_pcm_access_t access)
- {
-- int err, dir;
-+ int err;
-
- /* choose all parameters */
- err = snd_pcm_hw_params_any(handle,params);
-@@ -74,6 +73,12 @@
- printf("Access type not available for playback: %s\n", snd_strerror(err));
- return err;
- }
-+ /* set the access type */
-+ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
-+ if (err < 0) {
-+ printf("Sample format not available for playback: %s\n", snd_strerror(err));
-+ return err;
-+ }
- /* set the sample format */
- err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
- if (err < 0) {
-@@ -87,29 +92,42 @@
- return err;
- }
- /* set the stream rate */
-- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
-+ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
- if (err < 0) {
- printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
- return err;
- }
-- if (err != rate) {
-+ /*if (err != rate) {
- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
- return -EINVAL;
-+ }*/
-+ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
-+ return err;
- }
-+ if (buffer_time > BUFFER_TIME_MAX)
-+ buffer_time = BUFFER_TIME_MAX;
- /* set buffer time */
-- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
-+ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
- if (err < 0) {
- printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
- return err;
- }
-- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
-+ if (period_time * 4 > buffer_time)
-+ period_time = buffer_time / 4;
- /* set period time */
-- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
-+ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
- if (err < 0) {
- printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
- return err;
- }
-- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
-+ /* retrieve buffer size */
-+ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-+ if (err < 0) {
-+ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
-+ return err;
-+ }
- /* write the parameters to device */
- err = snd_pcm_hw_params(handle, params);
- if (err < 0) {
-@@ -123,6 +141,7 @@
- int set_swparams(snd_pcm_t *handle,
- snd_pcm_sw_params_t *params)
- {
-+ unsigned int start_threshold;
- int err;
-
- /* get current swparams */
-@@ -136,13 +155,7 @@
- if (err < 0) {
- printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
- return err;
-- }
-- /* allow transfer when at least period_size samples can be processed */
-- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
-- if (err < 0) {
-- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
-- return err;
-- }
-+ }
- /* align all transfers to 1 samples */
- err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
- if (err < 0) {
-@@ -190,7 +203,7 @@
- rate = config->speed;
-
- if ( bitdepth == 0 )
-- config->precision = bitdepth = 32;
-+ config->precision = bitdepth = 16;
-
- switch (bitdepth)
- {
-@@ -241,7 +254,7 @@
- return -1;
- }
-
-- buf = malloc(buffer_size);
-+ buf = malloc(buffer_size * sample_size);
- if (buf == NULL) {
- audio_error="unable to allocate output buffer table";
- return -1;
-@@ -279,7 +292,7 @@
- int play(struct audio_play *play)
- {
- int err, len;
-- char *ptr;
-+ unsigned char *ptr;
-
- ptr = buf;
- len = play->nsamples;
diff --git a/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
new file mode 100644
index 0000000..aa5d93b
--- /dev/null
+++ b/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
@@ -0,0 +1,187 @@
+Can't remember where I found these changes but they are mandatory, otherwise
+you will get this when compiling:
+audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
+audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
+audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/audio/madplay/madplay-audio-alsa.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/audio/madplay/madplay-audio-alsa.patch 2010-02-11 15:17:41.000000000 +0100
+@@ -0,0 +1,172 @@
++* needed for madplay to compile when ALSA is configured with
++ --with-versioned=no option.
++* fix allocation of buffer, buffer_size is number of frames
++* use default 16 bit depth (some hardware has small buffers, 16/24 bit
++ difference is very small)
++
++--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
+++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
++@@ -28,31 +28,30 @@
++
++ #include <errno.h>
++
++-#define ALSA_PCM_OLD_HW_PARAMS_API
++-#define ALSA_PCM_OLD_SW_PARAMS_API
++ #include <alsa/asoundlib.h>
++
++ #include <mad.h>
++
++ #include "audio.h"
++
++-char *buf = NULL;
++-int paused = 0;
+++#define BUFFER_TIME_MAX 500000
+++unsigned char *buf = NULL;
+++int paused = 0;
+++
+++unsigned int rate = 0;
+++unsigned int channels = -1;
+++unsigned int bitdepth = -1;
+++unsigned int sample_size= -1;
++
++-int rate = -1;
++-int channels = -1;
++-int bitdepth = -1;
++-int sample_size = -1;
++-
++-int buffer_time = 500000;
++-int period_time = 100000;
+++unsigned int buffer_time;
+++unsigned int period_time;
++ char *defaultdev = "plughw:0,0";
++
++ snd_pcm_hw_params_t *alsa_hwparams;
++ snd_pcm_sw_params_t *alsa_swparams;
++
++ snd_pcm_sframes_t buffer_size;
++-snd_pcm_sframes_t period_size;
+++snd_pcm_uframes_t period_size;
++
++ snd_pcm_format_t alsa_format = -1;
++ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
++@@ -66,7 +65,7 @@
++ snd_pcm_hw_params_t *params,
++ snd_pcm_access_t access)
++ {
++- int err, dir;
+++ int err;
++
++ /* choose all parameters */
++ err = snd_pcm_hw_params_any(handle,params);
++@@ -74,6 +73,12 @@
++ printf("Access type not available for playback: %s\n", snd_strerror(err));
++ return err;
++ }
+++ /* set the access type */
+++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
+++ if (err < 0) {
+++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* set the sample format */
++ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
++ if (err < 0) {
++@@ -87,29 +92,42 @@
++ return err;
++ }
++ /* set the stream rate */
++- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
+++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
++ if (err < 0) {
++ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
++ return err;
++ }
++- if (err != rate) {
+++ /*if (err != rate) {
++ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
++ return -EINVAL;
+++ }*/
+++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
+++ return err;
++ }
+++ if (buffer_time > BUFFER_TIME_MAX)
+++ buffer_time = BUFFER_TIME_MAX;
++ /* set buffer time */
++- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
+++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
++ if (err < 0) {
++ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
++ return err;
++ }
++- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
+++ if (period_time * 4 > buffer_time)
+++ period_time = buffer_time / 4;
++ /* set period time */
++- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
+++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
++ if (err < 0) {
++ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
++ return err;
++ }
++- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
+++ /* retrieve buffer size */
+++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* write the parameters to device */
++ err = snd_pcm_hw_params(handle, params);
++ if (err < 0) {
++@@ -123,6 +141,7 @@
++ int set_swparams(snd_pcm_t *handle,
++ snd_pcm_sw_params_t *params)
++ {
+++ unsigned int start_threshold;
++ int err;
++
++ /* get current swparams */
++@@ -136,13 +155,7 @@
++ if (err < 0) {
++ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
++ return err;
++- }
++- /* allow transfer when at least period_size samples can be processed */
++- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
++- if (err < 0) {
++- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
++- return err;
++- }
+++ }
++ /* align all transfers to 1 samples */
++ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
++ if (err < 0) {
++@@ -190,7 +203,7 @@
++ rate = config->speed;
++
++ if ( bitdepth == 0 )
++- config->precision = bitdepth = 32;
+++ config->precision = bitdepth = 16;
++
++ switch (bitdepth)
++ {
++@@ -241,7 +254,7 @@
++ return -1;
++ }
++
++- buf = malloc(buffer_size);
+++ buf = malloc(buffer_size * sample_size);
++ if (buf == NULL) {
++ audio_error="unable to allocate output buffer table";
++ return -1;
++@@ -279,7 +292,7 @@
++ int play(struct audio_play *play)
++ {
++ int err, len;
++- char *ptr;
+++ unsigned char *ptr;
++
++ ptr = buf;
++ len = play->nsamples;
diff --git a/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
new file mode 100644
index 0000000..c97e5b7
--- /dev/null
+++ b/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
@@ -0,0 +1,187 @@
+Can't remember where I found these changes but they are mandatory, otherwise
+you will get this when compiling:
+audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
+audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
+audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/madplay/madplay-audio-alsa.patch 2010-02-11 15:17:41.000000000 +0100
+@@ -0,0 +1,172 @@
++* needed for madplay to compile when ALSA is configured with
++ --with-versioned=no option.
++* fix allocation of buffer, buffer_size is number of frames
++* use default 16 bit depth (some hardware has small buffers, 16/24 bit
++ difference is very small)
++
++--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
+++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
++@@ -28,31 +28,30 @@
++
++ #include <errno.h>
++
++-#define ALSA_PCM_OLD_HW_PARAMS_API
++-#define ALSA_PCM_OLD_SW_PARAMS_API
++ #include <alsa/asoundlib.h>
++
++ #include <mad.h>
++
++ #include "audio.h"
++
++-char *buf = NULL;
++-int paused = 0;
+++#define BUFFER_TIME_MAX 500000
+++unsigned char *buf = NULL;
+++int paused = 0;
+++
+++unsigned int rate = 0;
+++unsigned int channels = -1;
+++unsigned int bitdepth = -1;
+++unsigned int sample_size= -1;
++
++-int rate = -1;
++-int channels = -1;
++-int bitdepth = -1;
++-int sample_size = -1;
++-
++-int buffer_time = 500000;
++-int period_time = 100000;
+++unsigned int buffer_time;
+++unsigned int period_time;
++ char *defaultdev = "plughw:0,0";
++
++ snd_pcm_hw_params_t *alsa_hwparams;
++ snd_pcm_sw_params_t *alsa_swparams;
++
++ snd_pcm_sframes_t buffer_size;
++-snd_pcm_sframes_t period_size;
+++snd_pcm_uframes_t period_size;
++
++ snd_pcm_format_t alsa_format = -1;
++ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
++@@ -66,7 +65,7 @@
++ snd_pcm_hw_params_t *params,
++ snd_pcm_access_t access)
++ {
++- int err, dir;
+++ int err;
++
++ /* choose all parameters */
++ err = snd_pcm_hw_params_any(handle,params);
++@@ -74,6 +73,12 @@
++ printf("Access type not available for playback: %s\n", snd_strerror(err));
++ return err;
++ }
+++ /* set the access type */
+++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
+++ if (err < 0) {
+++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* set the sample format */
++ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
++ if (err < 0) {
++@@ -87,29 +92,42 @@
++ return err;
++ }
++ /* set the stream rate */
++- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
+++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
++ if (err < 0) {
++ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
++ return err;
++ }
++- if (err != rate) {
+++ /*if (err != rate) {
++ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
++ return -EINVAL;
+++ }*/
+++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
+++ return err;
++ }
+++ if (buffer_time > BUFFER_TIME_MAX)
+++ buffer_time = BUFFER_TIME_MAX;
++ /* set buffer time */
++- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
+++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
++ if (err < 0) {
++ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
++ return err;
++ }
++- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
+++ if (period_time * 4 > buffer_time)
+++ period_time = buffer_time / 4;
++ /* set period time */
++- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
+++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
++ if (err < 0) {
++ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
++ return err;
++ }
++- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
+++ /* retrieve buffer size */
+++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* write the parameters to device */
++ err = snd_pcm_hw_params(handle, params);
++ if (err < 0) {
++@@ -123,6 +141,7 @@
++ int set_swparams(snd_pcm_t *handle,
++ snd_pcm_sw_params_t *params)
++ {
+++ unsigned int start_threshold;
++ int err;
++
++ /* get current swparams */
++@@ -136,13 +155,7 @@
++ if (err < 0) {
++ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
++ return err;
++- }
++- /* allow transfer when at least period_size samples can be processed */
++- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
++- if (err < 0) {
++- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
++- return err;
++- }
+++ }
++ /* align all transfers to 1 samples */
++ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
++ if (err < 0) {
++@@ -190,7 +203,7 @@
++ rate = config->speed;
++
++ if ( bitdepth == 0 )
++- config->precision = bitdepth = 32;
+++ config->precision = bitdepth = 16;
++
++ switch (bitdepth)
++ {
++@@ -241,7 +254,7 @@
++ return -1;
++ }
++
++- buf = malloc(buffer_size);
+++ buf = malloc(buffer_size * sample_size);
++ if (buf == NULL) {
++ audio_error="unable to allocate output buffer table";
++ return -1;
++@@ -279,7 +292,7 @@
++ int play(struct audio_play *play)
++ {
++ int err, len;
++- char *ptr;
+++ unsigned char *ptr;
++
++ ptr = buf;
++ len = play->nsamples;
diff --git a/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch b/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
new file mode 100644
index 0000000..4d8fda9
--- /dev/null
+++ b/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
@@ -0,0 +1,32 @@
+From 0296eef9774b080a5ddd960f9bc7694c4b590f7b Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Thu, 11 Feb 2010 13:40:40 +0100
+Subject: [PATCH] Updates rsync source repository
+
+rsync source repository has moved (?).
+Bump version while we are at it.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/rsync/rsync.mk | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
+index 1ed6812..e1bb28e 100644
+--- a/package/rsync/rsync.mk
++++ b/package/rsync/rsync.mk
+@@ -4,9 +4,9 @@
+ #
+ #############################################################
+
+-RSYNC_VERSION:=3.0.6
++RSYNC_VERSION:=3.0.7
+ RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
+-RSYNC_SITE:=http://rsync.samba.org/ftp/rsync
++RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
+ RSYNC_INSTALL_STAGING:=NO
+ RSYNC_INSTALL_TARGET:=YES
+ RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch b/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
new file mode 100644
index 0000000..54f3b6d
--- /dev/null
+++ b/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
@@ -0,0 +1,36 @@
+From 4ad3a1b57fb94d8fd8cf5a6e215afbcc16f50c23 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Thu, 11 Feb 2010 17:27:06 +0100
+Subject: [PATCH] alsamixer now seems to need libform, libmenu & libpanel (from ncurses)
+
+Without this patch alsamixer complains about missing libs and
+ldd says:
+ libform.so.5 => not found
+ libmenu.so.5 => not found
+ libpanel.so.5 => not found
+ libncurses.so.5 => /usr/lib/libncurses.so.5 (0x4000e000)
+ libasound.so.2 => /usr/lib/libasound.so.2 (0x40056000)
+ ... <cut>
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/multimedia/alsa-utils/Config.in | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
+index 54ab3f9..04057f4 100644
+--- a/package/multimedia/alsa-utils/Config.in
++++ b/package/multimedia/alsa-utils/Config.in
+@@ -24,6 +24,9 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL
+ config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
+ bool "alsamixer"
+ select BR2_PACKAGE_NCURSES
++ select BR2_PACKAGE_NCURSES_TARGET_PANEL
++ select BR2_PACKAGE_NCURSES_TARGET_FORM
++ select BR2_PACKAGE_NCURSES_TARGET_MENU
+ default y
+
+ config BR2_PACKAGE_ALSA_UTILS_AMIDI
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index e05712e..37b5a56 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -14,3 +14,4 @@ rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
+rm -f buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index fa42d5b..692a240 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -13,4 +13,4 @@ rm -rf buildroot/package/uucp/
rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/audio/flite/
rm -rf buildroot/package/libcurl/
-
+rm -f buildroot/package/audio/madplay/madplay-audio-alsa.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 3bea317..93f6da2 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -56,7 +56,7 @@ if [ "$answer" == "Buildroot" ]; then
QUILT_TARGET_NAME="Buildroot"
QUILT_MAKEFILE_TARGET="buildroot-unpacked"
QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
+ QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_PATCH_DIR
elif [ "$answer" == "U-Boot" ]; then
QUILT_TARGET_NAME="U-Boot"
QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-11 11:02:43
|
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 ac1dc3aa6157acaf797cfa640dbee0bc00a3e261 (commit)
via 1276f6f26edb9290765aceae3d7d3d3a203eb6c0 (commit)
via ab2e9dac07e5b6d2836055ead9722c5290f85653 (commit)
from b85dd01b87c06f451feae95331533709c7bbf6f6 (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 ac1dc3aa6157acaf797cfa640dbee0bc00a3e261
Merge: 1276f6f26edb9290765aceae3d7d3d3a203eb6c0 b85dd01b87c06f451feae95331533709c7bbf6f6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 12:02:08 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 1276f6f26edb9290765aceae3d7d3d3a203eb6c0
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 12:01:31 2010 +0100
[BUILDROOT] [2010.02] Adapt main Makefile.in for new BR
commit ab2e9dac07e5b6d2836055ead9722c5290f85653
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 10:56:49 2010 +0100
[BUILDROOT] [2010.02] Makes Linux use the correct config file again
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
Makefile.in | 54 +++++++++++++------
...config.sh-sets-THIS_MINOR-to-0-by-default.patch | 29 +++++++++++
3 files changed, 69 insertions(+), 20 deletions(-)
create mode 100644 patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
diff --git a/Makefile b/Makefile
index 17fc7d3..592a7a3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ include ./Makefile.in
#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
-#BUILDROOT_VERSION:=20100129
+#BUILDROOT_VERSION:=20100211
#BUILDROOT_PATCH_DIR = patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
@@ -83,9 +83,9 @@ help:
@echo ' source - download all sources needed for offline-build'
@echo ' source-check - check all packages for valid download URLs'
@echo
- @echo 'See www.armadeus.org for further armadeus details'
+ @echo 'See http://www.armadeus.org for further Armadeus details'
@echo 'See ./buildroot/docs/README and ./buildroot/docs/buildroot.html'
- @echo ' for further buildroot details'
+ @echo ' for further Buildroot details'
@echo
diff --git a/Makefile.in b/Makefile.in
index aef85c8..c3910b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,18 +5,26 @@
#
ifeq ($(ARMADEUS_BASE_DIR),)
-ARMADEUS_BASE_DIR=$(shell pwd)
+ARMADEUS_BASE_DIR:=$(shell pwd)
endif
-BUILDROOT_DIR=$(ARMADEUS_BASE_DIR)/buildroot
+BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
-include $(BUILDROOT_DIR)/.config
+ifeq ($(BR2_VERSION),"0.10.0-svn")
+# Old buildroot:
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell grep "U_BOOT_VERSION:=" $(BUILDROOT_DIR)/target/u-boot/Makefile.in 2>/dev/null | cut -d = -f 2)
-ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_PROJECT_NAME:=$(shell echo $(BR2_PROJECT))
-ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_UCLIBC_VERSION:=0.9.29
+else
+# New buildroot:
+ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_DEFAULT_KERNEL_VERSION))
+ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_UBOOT_VERSION))
+ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
+endif
+ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
+ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/sdl.mk 2>/dev/null | cut -d = -f 2)
ifeq ($(ARMADEUS_SDL_VERSION),)
@@ -24,16 +32,28 @@ ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
endif
ARMADEUS_PATCH_DIR=patches
-ARMADEUS_LINUX_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/linux-$(ARMADEUS_LINUX_VERSION)
-ARMADEUS_LINUX_PATCH_DIR=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
-ARMADEUS_U_BOOT_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
-ARMADEUS_UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
-ARMADEUS_BOARD_DIR=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)/
-ARMADEUS_ROOTFS_DIR=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)/root
-ARMADEUS_BINARIES=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
-ARMADEUS_ROOTFS_TAR=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
-ARMADEUS_STAGING_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)/staging_dir
-ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_STAGING_DIR)/usr/bin
-
-ARMADEUS_BUILD_DIR=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
-ARMADEUS_SDL_DIR=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+ifeq ($(BR2_VERSION),"0.10.0-svn")
+BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)
+BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)
+BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
+ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
+else
+BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
+BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
+BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
+ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
+endif
+
+ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
+ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
+ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
+ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
+ARMADEUS_STAGING_DIR:=$(BUILDROOT_BUILD_DIR)/staging_dir
+ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
+
+ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
+ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
+
diff --git a/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch b/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
new file mode 100644
index 0000000..edf01db
--- /dev/null
+++ b/patches/buildroot/2010.02/100-get_linux_config.sh-sets-THIS_MINOR-to-0-by-default.patch
@@ -0,0 +1,29 @@
+From 13cef349fdc8d01d09e8b1d62f1dd32376d53523 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 9 Feb 2010 15:18:29 +0100
+Subject: [PATCH] get_linux_config.sh: sets THIS_MINOR to 0 if not valid.
+
+Sets THIS_MINOR to 0 if not valid, ie when processing a Linux config file who do not
+have a minor number extension; ex: "<name>-linux-2.6.<major>.config"
+Otherwise bash is raising an error/exception (line 59) and script can not complete.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ scripts/get_linux_config.sh | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/get_linux_config.sh b/scripts/get_linux_config.sh
+index 1950e9d..5cd0e37 100755
+--- a/scripts/get_linux_config.sh
++++ b/scripts/get_linux_config.sh
+@@ -35,6 +35,7 @@ function linux_version()
+ KERNEL=`echo ${KCONFIG} | sed s/.*linux-2.6./linux-2.6./g -`
+ THIS_MAJOR=${KERNEL:10:2}
+ THIS_MINOR=${KERNEL:13}
++ THIS_MINOR=${THIS_MINOR:=0}
+ }
+
+ # Try to be careful...
+--
+1.6.0.4
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-10 14:19:43
|
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 b85dd01b87c06f451feae95331533709c7bbf6f6 (commit)
from 31fcd95ab43436dac6204f127334ba529bcf534a (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 b85dd01b87c06f451feae95331533709c7bbf6f6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 10 15:19:06 2010 +0100
[BUILDROOT] Fixes freescale-tools building due to recent packages move
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/freescale-tools/tools.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/package/armadeus/freescale-tools/tools.mk b/buildroot/package/armadeus/freescale-tools/tools.mk
index 139c2e9..bd764b2 100644
--- a/buildroot/package/armadeus/freescale-tools/tools.mk
+++ b/buildroot/package/armadeus/freescale-tools/tools.mk
@@ -29,7 +29,7 @@ $(FREESCALE_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(FREESCALE_TOOLS_SOURCE) $(DL_DIR)/
$(FREESCALE_TOOLS_CAT) $(DL_DIR)/$(FREESCALE_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
mv $(BUILD_DIR)/misc $(FREESCALE_TOOLS_DIR)
toolchain/patch-kernel.sh $(FREESCALE_TOOLS_DIR) $(DL_DIR) misc-\*.patch
- toolchain/patch-kernel.sh $(FREESCALE_TOOLS_DIR) package/freescale-tools \*misc-$(FREESCALE_TOOLS_VERSION)\*.patch
+ toolchain/patch-kernel.sh $(FREESCALE_TOOLS_DIR) package/armadeus/freescale-tools \*misc-$(FREESCALE_TOOLS_VERSION)\*.patch
touch $@
$(FREESCALE_TOOLS_DIR)/.configured: $(FREESCALE_TOOLS_DIR)/.unpacked
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-09 21:34:13
|
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 31fcd95ab43436dac6204f127334ba529bcf534a (commit)
via 267e6282528d0d2a56be1f4ceae517859f69e1c9 (commit)
via 203b8d3390da5ad6606fe46f1a25abf319a85d22 (commit)
via f58d4aa663d15cd4d7447e39bb3e7a5c269888af (commit)
from 89f5c0634dec1fed3f269a96b7ffbdf426375d33 (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 31fcd95ab43436dac6204f127334ba529bcf534a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 22:33:36 2010 +0100
Rename u-boot-unpacked target in u-boot-src-unpacked
commit 267e6282528d0d2a56be1f4ceae517859f69e1c9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 19:03:51 2010 +0100
Updates some .gitignore
commit 203b8d3390da5ad6606fe46f1a25abf319a85d22
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 19:03:02 2010 +0100
[BUILDROOT] [2010.02] Makes U-Boot binary renaming work again
commit f58d4aa663d15cd4d7447e39bb3e7a5c269888af
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 18:15:59 2010 +0100
[BUILDROOT] [2010.02] Updates apf27 default config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 5 +-
buildroot/target/.gitignore | 2 +-
buildroot/target/device/.gitignore | 3 +-
buildroot/target/device/armadeus/apf27/Makefile.in | 6 ++-
.../target/device/armadeus/apf9328/Makefile.in | 3 +
buildroot/target/u-boot/.gitignore | 1 +
patches/buildroot/051-u-boot.patch | 2 +-
.../051a-u-boot-add_copy_to_functionnality.patch | 4 +-
.../051g-u-boot-add_u-boot-unpacked_target.patch | 2 +-
...ot-makes_binary_targets_name_overloadable.patch | 44 ++++++++++++++++++++
scripts/quiltify.sh | 2 +-
11 files changed, 64 insertions(+), 10 deletions(-)
create mode 100644 patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 44fb9d0..fbfb306 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Feb 8 16:44:09 2010
+# Tue Feb 9 11:51:05 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02-git"
@@ -800,7 +800,8 @@ BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
# BR2_TARGET_UBOOT_SILENT is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-# BR2_TARGET_UBOOT_TOOL_ENV is not set
+BR2_TARGET_UBOOT_TOOL_ENV=y
+BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
#
diff --git a/buildroot/target/.gitignore b/buildroot/target/.gitignore
index e965ec4..6d7796a 100644
--- a/buildroot/target/.gitignore
+++ b/buildroot/target/.gitignore
@@ -11,7 +11,7 @@
/jffs2/
/linux/
/makedevs
-Makefile.in
+/Makefile.in
/powerpc/
/romfs/
/squashfs/
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
index be8347b..b3132da 100644
--- a/buildroot/target/device/.gitignore
+++ b/buildroot/target/device/.gitignore
@@ -6,7 +6,8 @@ Config.*
Hitachi/
jp/
KwikByte/
-Makefile.*
+Makefile.in.linux
+/Makefile.in
mips/
Sharp/
Soekris/
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/apf27/Makefile.in
index 00fa0b1..8e48415 100644
--- a/buildroot/target/device/armadeus/apf27/Makefile.in
+++ b/buildroot/target/device/armadeus/apf27/Makefile.in
@@ -1,2 +1,6 @@
+ifeq ($(BR2_VERSION),"0.10.0-svn")
U_BOOT_BINLOC=u-boot-nand.bin
-
+else
+U_BOOT_BIN=u-boot-nand.bin
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
+endif
diff --git a/buildroot/target/device/armadeus/apf9328/Makefile.in b/buildroot/target/device/armadeus/apf9328/Makefile.in
index 09dbe0f..a6e01f7 100644
--- a/buildroot/target/device/armadeus/apf9328/Makefile.in
+++ b/buildroot/target/device/armadeus/apf9328/Makefile.in
@@ -1 +1,4 @@
TARGETS+=u-boot-brec
+ifneq ($(BR2_VERSION),"0.10.0-svn")
+U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
+endif
diff --git a/buildroot/target/u-boot/.gitignore b/buildroot/target/u-boot/.gitignore
index 6037245..faccc6c 100644
--- a/buildroot/target/u-boot/.gitignore
+++ b/buildroot/target/u-boot/.gitignore
@@ -1 +1,2 @@
/Config.in
+/Makefile.in
diff --git a/patches/buildroot/051-u-boot.patch b/patches/buildroot/051-u-boot.patch
index 937ec89..b9920c2 100644
--- a/patches/buildroot/051-u-boot.patch
+++ b/patches/buildroot/051-u-boot.patch
@@ -66,7 +66,7 @@ Index: buildroot/target/u-boot/Makefile.in
| tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-+u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++u-boot-src-unpacked: $(U_BOOT_DIR)/.unpacked
+
$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/ \
diff --git a/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
index 1224d6f..d43c71f 100644
--- a/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
+++ b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
@@ -29,7 +29,7 @@ Index: buildroot/target/u-boot/Makefile.in
+ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_COPYTO)),)
+U_BOOT_COPYTO:=$(call qstrip,$(BR2_TARGET_UBOOT_COPYTO))
-+U_BOOT_TARGETS+=$(U_BOOT_COPYTO)/$(U_BOOT_BIN)
++U_BOOT_TARGETS+=$(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN)
+endif
+
U_BOOT_CONFIGURE_OPTS :=
@@ -40,7 +40,7 @@ Index: buildroot/target/u-boot/Makefile.in
(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+ifneq ($(U_BOOT_COPYTO),)
-+$(U_BOOT_COPYTO)/$(U_BOOT_BIN): $(BINARIES_DIR)/$(U_BOOT_BIN)
++$(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(U_BOOT_COPYTO)
+ cp -dpf $< $@
+endif
diff --git a/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
index d8c20b5..3110dfc 100644
--- a/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
+++ b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -8,7 +8,7 @@ Index: buildroot/target/u-boot/Makefile.in
mkdir -p $(U_BOOT_DIR)
touch $@
-+u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++u-boot-src-unpacked: $(U_BOOT_DIR)/.unpacked
+
$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
diff --git a/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
new file mode 100644
index 0000000..14a2507
--- /dev/null
+++ b/patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -0,0 +1,44 @@
+Allow board custom Makefiles to choose the name of the U-Boot's resulting binary
+and the name it should take when copied to $(BINARIES_DIR).
+
+Specific for Armadeus.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-09 16:25:54.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-09 16:48:44.000000000 +0100
+@@ -11,14 +11,18 @@
+ U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
+ U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
+ U_BOOT_CAT:=$(BZCAT)
++ifeq ($(U_BOOT_BIN),)
+ U_BOOT_BIN:=u-boot.bin
++endif
++ifeq ($(U_BOOT_TARGET_BIN),)
+ U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
++endif
+
+ U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage
+ MKIMAGE:=$(U_BOOT_TOOLS)
+ U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
+
+-U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
++U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_TARGET_BIN) $(U_BOOT_TOOLS)
+
+ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV)),y)
+ U_BOOT_TARGETS += u-boot-autoscript
+@@ -185,11 +189,10 @@
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
+ -C $(U_BOOT_DIR)
+
+-$(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
++$(BINARIES_DIR)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
+ rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+ cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+- (cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+
+ ifneq ($(U_BOOT_COPYTO),)
+ $(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 0ea5871..3bea317 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -59,7 +59,7 @@ if [ "$answer" == "Buildroot" ]; then
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
elif [ "$answer" == "U-Boot" ]; then
QUILT_TARGET_NAME="U-Boot"
- QUILT_MAKEFILE_TARGET="u-boot-unpacked"
+ QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
QUILT_MAKEFILE_TARGET_TOUCH=".unpacked .patched"
QUILT_PATCH_FILTER="$ARMADEUS_U_BOOT_VERSION"
QUILT_TARGET_DIR=$ARMADEUS_U_BOOT_DIR
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-09 10:10:45
|
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 89f5c0634dec1fed3f269a96b7ffbdf426375d33 (commit)
via b0479b2751e1cf0bbee0404c025d9ec11c88b669 (commit)
from 6991289a87361580df838696bef4e333eaf86f15 (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 89f5c0634dec1fed3f269a96b7ffbdf426375d33
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 11:09:39 2010 +0100
[U-BOOT] Make it linkable with gcc 4.3/4.4 EABI
commit b0479b2751e1cf0bbee0404c025d9ec11c88b669
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 11:05:51 2010 +0100
[BUILDROOT] Don't uncompress .gitignore from BR archive if present
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...linking_problems_with_gcc_4_3_and_gcc_4_4.patch | 59 ++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
diff --git a/Makefile b/Makefile
index 6ffb30e..17fc7d3 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
BUILDROOT_DIR = buildroot
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
-TAR_OPTIONS=--exclude=.svn --exclude=.git -xf
+TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore -xf
ARMADEUS_ENV_FILE=armadeus_env.sh
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch b/buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
new file mode 100644
index 0000000..a95e65c
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
@@ -0,0 +1,59 @@
+Don't know if it's the right way to do (marked as HACK in Openmoko). But
+without this patch, U-Boot (1.3.4) fails to link when gcc 4.3 or 4.4 is used.
+
+Errors are:
+
+xxx/buildroot/output/build/staging_dir/usr/bin-ccache/../lib/gcc/arm-linux-uclibcgnueabi/4.3.4/libgcc.a(_udivsi3.o): In function `__aeabi_uidiv':
+xxx/buildroot/output/toolchain/gcc-4.3.4/libgcc/../gcc/config/arm/lib1funcs.asm:810: multiple definition of `__udivsi3' lib_arm/libarm.a(_udivsi3.o):xxx/buildroot/output/build/u-boot-1.3.4/lib_arm/_udivsi3.S:17: first defined here
+...
+xxx/buildroot/output/build/staging_dir/usr/bin/arm-linux-uclibcgnueabi-ld: error: Source object xxx/buildroot/output/build/staging_dir/usr/bin-ccache/../lib/gcc/arm-linux-uclibcgnueabi/4.3.4/libgcc.a(_udivdi3.o) has EABI version 4, but target u-boot has EABI version 0
+xxx/buildroot/output/build/staging_dir/usr/bin/arm-linux-uclibcgnueabi-ld: failed to merge target specific data of file /home/julien/workspace/Armadeus_SF/armadeus-git-new-buildroot-build/buildroot/output/build/staging_dir/usr/bin-ccache/../lib/gcc/arm-linux-uclibcgnueabi/4.3.4/libgcc.a(_udivdi3.o)
+...
+xxx/buildroot/output/build/staging_dir/usr/bin/arm-linux-uclibcgnueabi-ld: failed to merge target specific data of file xxx/buildroot/output/build/staging_dir/usr/bin-ccache/../lib/gcc/arm-linux-uclibcgnueabi/4.3.4/libgcc.a(_clz.o)
+xxx/buildroot/output/build/staging_dir/usr/bin-ccache/../lib/gcc/arm-linux-uclibcgnueabi/4.3.4/libgcc.a(_udivdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0'
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+--- u-boot-1.3.4.org/board/armadeus/apf27/apf27.c 2010-02-08 11:48:29.000000000 +0100
++++ u-boot-1.3.4/board/armadeus/apf27/apf27.c 2010-02-05 23:01:33.000000000 +0100
+@@ -179,3 +179,7 @@
+ printf("Armadeus APF2\n");
+ return 0;
+ }
++
++void raise() {}
++void abort() {}
++
+--- u-boot-1.3.4.org/board/armadeus/apf27/u-boot-nand.lds 2010-02-08 11:48:29.000000000 +0100
++++ u-boot-1.3.4/board/armadeus/apf27/u-boot-nand.lds 2010-02-05 22:55:57.000000000 +0100
+@@ -37,6 +37,10 @@
+
+ . = ALIGN(4);
+ .rodata : { *(.rodata) }
++ .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++ __exidx_start = .;
++ .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++ __exidx_end = .;
+
+ . = ALIGN(4);
+ .data : { *(.data) }
+--- u-boot-1.3.4.org/cpu/arm926ejs/config.mk 2010-02-08 11:48:29.000000000 +0100
++++ u-boot-1.3.4/cpu/arm926ejs/config.mk 2010-02-05 23:03:48.000000000 +0100
+@@ -30,5 +30,5 @@
+ # Supply options according to compiler version
+ #
+ # =========================================================================
+-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
++PLATFORM_CPPFLAGS +=$(call cc-option)
+ PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
+--- u-boot-1.3.4.org/Makefile 2010-02-08 11:48:29.000000000 +0100
++++ u-boot-1.3.4/Makefile 2010-02-05 22:58:40.000000000 +0100
+@@ -253,7 +253,7 @@
+ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
+
+ # Add GCC lib
+-PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
++PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh
+
+ # The "tools" are needed early, so put this first
+ # Don't include stuff already done in $(LIBS)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-09 08:43:08
|
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 6991289a87361580df838696bef4e333eaf86f15 (commit)
via c0040595e9e3251769220050225844b5f42b7a06 (commit)
via 9fe0fb58c76eb993108b3ea6aea29cb682382211 (commit)
via 03bca8832be2b0513517207863c937986ef7554e (commit)
via b001b7272d07a7ce316c6b8b604ecfb84134c461 (commit)
from bb4806807ebaf7f204a886f1b98470617ce758d1 (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 6991289a87361580df838696bef4e333eaf86f15
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 9 09:41:32 2010 +0100
[BUILDROOT] [2010.02] Makes 051/U-Boot patch work again by dividing it in functionnal sub-patches. Add a first U-Boot 1.3.4 fix for gcc 4.4 (from mainline).
commit c0040595e9e3251769220050225844b5f42b7a06
Author: Julien Boibessot <jul...@ar...>
Date: Sat Feb 6 11:31:45 2010 +0100
Improve comments in quiltify.sh
commit 9fe0fb58c76eb993108b3ea6aea29cb682382211
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:29:47 2010 +0100
[BUILDROOT] [2010.02] Fixes 053-libusb.patch
commit 03bca8832be2b0513517207863c937986ef7554e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:28:34 2010 +0100
[BUILDROOT] [2010.02] Updates cleanup_buildroot.sh
commit b001b7272d07a7ce316c6b8b604ecfb84134c461
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 5 10:28:07 2010 +0100
[BUILDROOT] [2010.02] Removes unneeded 026-jffs2root.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 9 ++-
buildroot/package/.gitignore | 1 +
buildroot/target/.gitignore | 1 +
buildroot/target/device/.gitignore | 1 +
..._symbols_inlined_compilation_with_gcc_4_4.patch | 59 ++++++++++++++++++++
patches/buildroot/026-jffs2root.patch | 2 +
.../2010.02/026-jffs2root.unused_to_check | 18 ------
.../051a-u-boot-add_copy_to_functionnality.patch | 57 +++++++++++++++++++
...1b-u-boot-change_board_name_default_value.patch | 15 +++++
...51c-u-boot-makes_u-boot-clean_target_work.patch | 19 ++++++
...d_possibility_to_choose_board_header_file.patch | 53 ++++++++++++++++++
...u-boot-add_1.3.4_version_specific_support.patch | 49 ++++++++++++++++
...madeus_specific_options_for_config_header.patch | 30 ++++++++++
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 +++++
.../2010.02/053-libusb-bump_version.patch | 21 +++++++
patches/buildroot/2010.02/053-libusb.to_fix | 13 ----
patches/buildroot/2010.02/cleanup_buildroot.sh | 2 +-
scripts/quiltify.sh | 4 +-
18 files changed, 333 insertions(+), 36 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
delete mode 100644 patches/buildroot/2010.02/026-jffs2root.unused_to_check
create mode 100644 patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
create mode 100644 patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
create mode 100644 patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
create mode 100644 patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
create mode 100644 patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
create mode 100644 patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
create mode 100644 patches/buildroot/2010.02/053-libusb-bump_version.patch
delete mode 100644 patches/buildroot/2010.02/053-libusb.to_fix
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b1d0160..44fb9d0 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Feb 3 13:49:16 2010
+# Mon Feb 8 16:44:09 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.02-git"
@@ -529,6 +529,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_PCMCIA is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SYSSTAT is not set
@@ -784,14 +785,16 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
-BR2_TARGET_UBOOT_2009_11=y
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_2009_11 is not set
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_2009_06 is not set
# BR2_TARGET_UBOOT_2009_03 is not set
# BR2_TARGET_UBOOT_2009_01 is not set
# BR2_TARGET_UBOOT_2008_10 is not set
# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
-BR2_UBOOT_VERSION="2009.11"
+BR2_UBOOT_VERSION="1.3.4"
BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 29bfb0f..14597d9 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -4,6 +4,7 @@
/Config.in
/Config.in.bak
/Makefile.autotools.in
+/Makefile.package.in
/Makefile.in
/buildroot-libtool.patch
diff --git a/buildroot/target/.gitignore b/buildroot/target/.gitignore
index b0582a5..e965ec4 100644
--- a/buildroot/target/.gitignore
+++ b/buildroot/target/.gitignore
@@ -19,3 +19,4 @@ Makefile.in
#ubifs
#u-boot
/x86/
+/xtensa/
diff --git a/buildroot/target/device/.gitignore b/buildroot/target/device/.gitignore
index 4b19070..be8347b 100644
--- a/buildroot/target/device/.gitignore
+++ b/buildroot/target/device/.gitignore
@@ -13,3 +13,4 @@ Soekris/
valka/
Via/
x86/
+xtensa/
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch b/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
new file mode 100644
index 0000000..9cbfbf7
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
@@ -0,0 +1,59 @@
+From: Ron Lee <ro...@de...>
+Date: Wed, 5 Aug 2009 18:14:01 +0000 (+0200)
+Subject: ARM Don't inline weak symbols
+X-Git-Tag: v2009.11-rc2~59^2
+X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=f865fcbbb35851e75fee9c3a3fa8e0f71d9e6463
+
+ARM Don't inline weak symbols
+
+------------------------------------------------------------------------
+
+GCC 4.4 complains about this now.
+
+Signed-off-by: Ron Lee <ro...@de...>
+---
+
+Index: u-boot-1.3.4/lib_arm/board.c
+===================================================================
+--- u-boot-1.3.4.orig/lib_arm/board.c 2010-02-05 16:48:16.000000000 +0100
++++ u-boot-1.3.4/lib_arm/board.c 2010-02-05 16:48:20.000000000 +0100
+@@ -135,19 +135,19 @@
+ * May be supplied by boards if desired
+ */
+ void inline __coloured_LED_init (void) {}
+-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+ void inline __red_LED_on (void) {}
+-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+ void inline __red_LED_off(void) {}
+-void inline red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
++void red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
+ void inline __green_LED_on(void) {}
+-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+ void inline __green_LED_off(void) {}
+-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+ void inline __yellow_LED_on(void) {}
+-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+ void inline __yellow_LED_off(void) {}
+-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+
+ /************************************************************************
+ * Init Utilities *
+Index: u-boot-1.3.4/common/main.c
+===================================================================
+--- u-boot-1.3.4.orig/common/main.c 2010-02-05 16:50:51.000000000 +0100
++++ u-boot-1.3.4/common/main.c 2010-02-05 16:51:14.000000000 +0100
+@@ -48,7 +48,7 @@
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+ void inline __show_boot_progress (int val) {}
+-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+
+ #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
+ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
diff --git a/patches/buildroot/026-jffs2root.patch b/patches/buildroot/026-jffs2root.patch
index 5173e2c..592ccf3 100644
--- a/patches/buildroot/026-jffs2root.patch
+++ b/patches/buildroot/026-jffs2root.patch
@@ -1,3 +1,5 @@
+No more needed with latest BR version.
+
Index: buildroot/target/jffs2/jffs2root.mk
===================================================================
--- buildroot.orig/target/jffs2/jffs2root.mk 2010-01-25 10:03:35.000000000 +0100
diff --git a/patches/buildroot/2010.02/026-jffs2root.unused_to_check b/patches/buildroot/2010.02/026-jffs2root.unused_to_check
deleted file mode 100644
index 1fa5341..0000000
--- a/patches/buildroot/2010.02/026-jffs2root.unused_to_check
+++ /dev/null
@@ -1,18 +0,0 @@
-No more usefull on 2010.02 ???
-
-Index: buildroot/target/jffs2/jffs2root.mk
-===================================================================
---- buildroot.orig/target/jffs2/jffs2root.mk 2010-01-25 10:03:35.000000000 +0100
-+++ buildroot/target/jffs2/jffs2root.mk 2010-01-25 10:04:15.000000000 +0100
-@@ -58,7 +58,10 @@
- ifneq ($(BR2_HAVE_INFOPAGES),y)
- @rm -rf $(TARGET_DIR)/usr/info
- endif
-- @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-+ @test -d $(TARGET_DIR)/usr/share && \
-+ rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
-+ true
-+# @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
- $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
- # Use fakeroot to pretend all target binaries are owned by root
- rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
diff --git a/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
new file mode 100644
index 0000000..1224d6f
--- /dev/null
+++ b/patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
@@ -0,0 +1,57 @@
+Implements (quite) the same as BR2_LINUX_COPYTO for U-Boot.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-05 13:31:08.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-05 14:38:40.000000000 +0100
+@@ -126,6 +126,12 @@
+ help
+ Install fw_printenv / fw_setenv tools in target.
+
++config BR2_TARGET_UBOOT_COPYTO
++ string "Copy binary image to <dir>..."
++ default ""
++ help
++ Copy U-Boot binary image to secondary location.
++
+ menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
+ bool "Generate a default environment"
+ help
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-05 14:05:30.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-05 14:08:52.000000000 +0100
+@@ -46,6 +46,11 @@
+ U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
+ endif
+
++ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_COPYTO)),)
++U_BOOT_COPYTO:=$(call qstrip,$(BR2_TARGET_UBOOT_COPYTO))
++U_BOOT_TARGETS+=$(U_BOOT_COPYTO)/$(U_BOOT_BIN)
++endif
++
+ U_BOOT_CONFIGURE_OPTS :=
+
+ ifneq ($(BR2_TARGET_UBOOT_1_2_0_ATMEL),)
+@@ -167,6 +172,12 @@
+ cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
+ (cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
+
++ifneq ($(U_BOOT_COPYTO),)
++$(U_BOOT_COPYTO)/$(U_BOOT_BIN): $(BINARIES_DIR)/$(U_BOOT_BIN)
++ mkdir -p $(U_BOOT_COPYTO)
++ cp -dpf $< $@
++endif
++
+ $(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(@D)
+ cp -dpf $(U_BOOT_DIR)/tools/mkimage $@
+@@ -289,5 +300,6 @@
+ @echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR)
+ @echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
+ @echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
++ @echo U_BOOT_COPYTO = $(U_BOOT_COPYTO)
+ @exit 0
+
diff --git a/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch b/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
new file mode 100644
index 0000000..43e8a1f
--- /dev/null
+++ b/patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
@@ -0,0 +1,15 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-05 15:28:46.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-05 15:29:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ if BR2_TARGET_UBOOT
+ config BR2_TARGET_UBOOT_BOARDNAME
+ string "board name"
+- default "$(BOARD_NAME)"
++ default "$(BR2_BOARD_NAME)"
+ help
+ One of U-Boot supported boards to be built.
+ This will be suffixed with _config to meet U-Boot standard naming.
diff --git a/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch b/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
new file mode 100644
index 0000000..79fbd39
--- /dev/null
+++ b/patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
@@ -0,0 +1,19 @@
+Otherwise "make u-boot-clean" complains if arm-linux-gcc is not is your PATH.
+Only needed for U-Boot 1.3.4 ??
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-06 15:17:24.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:19:29.000000000 +0100
+@@ -208,7 +208,8 @@
+ u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).img
+
+ u-boot-clean:
+- -$(MAKE) -C $(U_BOOT_DIR) clean
++ -$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) -C $(U_BOOT_DIR) clean
++ rm -f $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ rm -f $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
+
+ u-boot-dirclean:
diff --git a/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
new file mode 100644
index 0000000..834a5f4
--- /dev/null
+++ b/patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -0,0 +1,53 @@
+
+BR maintainer removes this change (and others) with this commit:
+http://git.buildroot.net/buildroot/commit/?id=3bab463be4a42de790b745ab2e873e1c1ce42f2d
+
+We need it because U-Boot's mainline doesn't have (yet?) our boards configs.
+So this patch reverts the removing + refines it.
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-08 11:34:35.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-08 11:34:38.000000000 +0100
+@@ -11,6 +11,14 @@
+ One of U-Boot supported boards to be built.
+ This will be suffixed with _config to meet U-Boot standard naming.
+
++config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
++ string "U-Boot header file"
++ default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
++ help
++ U-Boot config header file to use to build U-Boot for your target.
++ Mainly for people using boards not (yet) integrated in U-Boot's
++ mainline or wanting to test a config different from the default one.
++
+ choice
+ prompt "U-Boot Version"
+ default BR2_TARGET_UBOOT_2009_11
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:34:36.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:34:38.000000000 +0100
+@@ -88,7 +88,13 @@
+ endif
+ touch $@
+
+-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
++$(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
++ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
++ cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
++endif
++ touch $@
++
++$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.config_header_copied
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+@@ -292,6 +298,7 @@
+ u-boot-status:
+ @echo
+ @echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)
++ @echo BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE = $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)
+ @echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)
+ @echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)
+ @echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)
diff --git a/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
new file mode 100644
index 0000000..60adf2a
--- /dev/null
+++ b/patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -0,0 +1,49 @@
+Specific for Armadeus boards.
+
+Index: buildroot/target/u-boot/Config.in
+===================================================================
+--- buildroot.orig/target/u-boot/Config.in 2010-02-08 11:19:36.000000000 +0100
++++ buildroot/target/u-boot/Config.in 2010-02-08 11:19:36.000000000 +0100
+@@ -25,6 +25,9 @@
+ help
+ Select the specific U-Boot version you want to use
+
++config BR2_TARGET_UBOOT_1_3_4
++ bool "u-boot-1.3.4"
++
+ config BR2_TARGET_UBOOT_2009_11
+ bool "u-boot-2009.11"
+
+@@ -56,6 +59,7 @@
+
+ config BR2_UBOOT_VERSION
+ string
++ default "1.3.4" if BR2_TARGET_UBOOT_1_3_4
+ default "2009.11" if BR2_TARGET_UBOOT_2009_11
+ default "2009.08" if BR2_TARGET_UBOOT_2009_08
+ default "2009.06" if BR2_TARGET_UBOOT_2009_06
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:25:55.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:33:26.000000000 +0100
+@@ -190,6 +190,11 @@
+
+ $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
+ mkdir -p $(@D)
++ifeq ($(U_BOOT_VERSION),1.3.4)
++ $(TARGET_CC) -I$(U_BOOT_DIR)/include -DUSE_HOSTCC -o $@ \
++ $(U_BOOT_DIR)/tools/mkimage.c \
++ $(addprefix $(U_BOOT_DIR)/tools/,crc32.c image.c md5.c sha1.c fdt*.c)
++else
+ $(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
+ -DUSE_HOSTCC -o $@ \
+ $(U_BOOT_DIR)/common/image.c \
+@@ -198,7 +203,7 @@
+ $(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \
+ $(U_BOOT_DIR)/tools/os_support.c \
+ $(U_BOOT_DIR)/libfdt/fdt*.c
+-
++endif
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
+
+ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
diff --git a/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
new file mode 100644
index 0000000..0334050
--- /dev/null
+++ b/patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -0,0 +1,30 @@
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-08 11:34:47.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-08 11:34:52.000000000 +0100
+@@ -162,6 +162,17 @@
+ endif
+ @echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
+ endif # BR2_TARGET_UBOOT_DEFAULT_ENV
++ifneq ($(strip $(BOARD_NAME)),"")
++ $(call insert_define, CONFIG_BOARD_NAME, $(BOARD_NAME))
++endif
++ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),)
++ $(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
++ $(U_BOOT_INC_CONF_FILE)
++endif
++ifneq ($(BR2_TARGET_ARMADEUS_NR_SDRAM),)
++ $(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
++ $(U_BOOT_INC_CONF_FILE)
++endif
+ touch $@
+
+ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
+@@ -314,5 +325,7 @@
+ @echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
+ @echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
+ @echo U_BOOT_COPYTO = $(U_BOOT_COPYTO)
++ @echo BR2_TARGET_ARMADEUS_SDRAM_SIZE = $(BR2_TARGET_ARMADEUS_SDRAM_SIZE)
++ @echo BR2_TARGET_ARMADEUS_NR_SDRAM = $(BR2_TARGET_ARMADEUS_NR_SDRAM)
+ @exit 0
+
diff --git a/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
new file mode 100644
index 0000000..d8c20b5
--- /dev/null
+++ b/patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -0,0 +1,15 @@
+Specific for Armadeus (needed by quiltify script).
+
+Index: buildroot/target/u-boot/Makefile.in
+===================================================================
+--- buildroot.orig/target/u-boot/Makefile.in 2010-02-05 15:09:08.000000000 +0100
++++ buildroot/target/u-boot/Makefile.in 2010-02-05 15:09:35.000000000 +0100
+@@ -74,6 +74,8 @@
+ mkdir -p $(U_BOOT_DIR)
+ touch $@
+
++u-boot-unpacked: $(U_BOOT_DIR)/.unpacked
++
+ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
+ u-boot-$(U_BOOT_VERSION)-\*.patch \
diff --git a/patches/buildroot/2010.02/053-libusb-bump_version.patch b/patches/buildroot/2010.02/053-libusb-bump_version.patch
new file mode 100644
index 0000000..594395e
--- /dev/null
+++ b/patches/buildroot/2010.02/053-libusb-bump_version.patch
@@ -0,0 +1,21 @@
+0.1.12-10 is no more available, so move to latest version.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/libusb/libusb.mk
+===================================================================
+--- buildroot.orig/package/libusb/libusb.mk 2010-02-05 10:18:33.000000000 +0100
++++ buildroot/package/libusb/libusb.mk 2010-02-05 10:19:29.000000000 +0100
+@@ -4,9 +4,10 @@
+ #
+ #############################################################
+ LIBUSB_VERSION:=0.1.12
+-LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-10.diff.gz
++LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-14.diff.gz
+ LIBUSB_SOURCE:=libusb_$(LIBUSB_VERSION).orig.tar.gz
+-LIBUSB_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/libu/libusb
++#LIBUSB_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/libu/libusb
++LIBUSB_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libu/libusb
+ LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VERSION)
+ LIBUSB_CAT:=$(ZCAT)
+ LIBUSB_BINARY:=usr/lib/libusb.so
diff --git a/patches/buildroot/2010.02/053-libusb.to_fix b/patches/buildroot/2010.02/053-libusb.to_fix
deleted file mode 100644
index dfff8c8..0000000
--- a/patches/buildroot/2010.02/053-libusb.to_fix
+++ /dev/null
@@ -1,13 +0,0 @@
-Latest BR downgrades to 0.1.12-10 from snapshot.debian.net
-
---- buildroot/package/libusb/libusb.mk~ 2008-11-21 09:15:25.000000000 +0100
-+++ buildroot/package/libusb/libusb.mk 2008-11-22 18:12:18.000000000 +0100
-@@ -4,7 +4,7 @@
- #
- #############################################################
- LIBUSB_VERSION:=0.1.12
--LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-12.diff.gz
-+LIBUSB_PATCH_FILE:=libusb_$(LIBUSB_VERSION)-13.diff.gz
- LIBUSB_SOURCE:=libusb_$(LIBUSB_VERSION).orig.tar.gz
- #LIBUSB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libusb/
- LIBUSB_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libu/libusb
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index ce31382..e05712e 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -13,4 +13,4 @@ rm -rf buildroot/package/uucp/
rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
-
+rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index cfda698..0ea5871 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -103,8 +103,9 @@ if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
EXT=`date +%Y_%m_%d_%Hh%M`
if [ "$answer" == "d" ]; then
- echo "Deleting current $QUILT_TARGET_NAME dir"
+ echo -n "Deleting current $QUILT_TARGET_NAME dir..."
rm -rf $QUILT_TARGET_DIR
+ echo "done"
else
echo "Renaming $QUILT_TARGET_DIR"
echo " to " "$QUILT_TARGET_DIR"."$EXT"
@@ -118,6 +119,7 @@ else # For Buildroot
fi
# Get XXX unpacked sources
+echo "Getting sources... (make $QUILT_MAKEFILE_TARGET)"
make $QUILT_MAKEFILE_TARGET
if [ "$?" != 0 ]; then
echo "Failed to get sources, please check your view !!"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-03 15:14: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 bb4806807ebaf7f204a886f1b98470617ce758d1 (commit)
via eeeba84f73c2df3fe06ab33405e01f8d85f79b58 (commit)
via 399af440beddf579a647673f21916fd7ecfaa0d2 (commit)
via 7154768c9959e0a96769ef2808cb5adaad3dd4d8 (commit)
via d8178ade4895943feb1020a67fc7ae53d24dcc32 (commit)
via f0b0d4c9378ea5b0e9a0c4bf0912ab2a37026d39 (commit)
via 924028e91defad2ffa386d72ed2fb6d476ae99f5 (commit)
via ed30f49574f71fdb45ea9f9112c59c1bcc7f7d92 (commit)
via f97a415f882047e4a4e6c49f76dc434fdd5d54f4 (commit)
via 5f6b3c1443f9e28dc695ecc067adf0cf6abf43ee (commit)
via 7ae4a5f9b77c562308159c0be317df981dcfa63c (commit)
via 07815d94911ec69d6fc3e814957c0cd456e284b5 (commit)
via ae59bc50f258f12e5b5f75c45e6915d6503250e8 (commit)
via b23f92f7b1d8b4da5dffe07f4a04136bc7e51b10 (commit)
via 12b7ab5ca0688dab5570a2656f00268d49da0b4c (commit)
via 5f742f7605c1d6c1cdb80a090d13325926f08db7 (commit)
from 25c21a07330c257b8ca1c5833c2848c54cba80aa (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 bb4806807ebaf7f204a886f1b98470617ce758d1
Merge: eeeba84f73c2df3fe06ab33405e01f8d85f79b58 25c21a07330c257b8ca1c5833c2848c54cba80aa
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 16:13:35 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit eeeba84f73c2df3fe06ab33405e01f8d85f79b58
Merge: 399af440beddf579a647673f21916fd7ecfaa0d2 dddc2e0376fa32e009063c6e432ae91b38ed53e7
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 15:32:48 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 399af440beddf579a647673f21916fd7ecfaa0d2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 15:23:09 2010 +0100
[BUILDROOT] fbgrab depends on zlib
commit 7154768c9959e0a96769ef2808cb5adaad3dd4d8
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 15:21:32 2010 +0100
[BUILDROOT] Add comments to patch 049
commit d8178ade4895943feb1020a67fc7ae53d24dcc32
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 15:18:46 2010 +0100
[BUILDROOT] [2010.02] Removes unneeded 035 patch
commit f0b0d4c9378ea5b0e9a0c4bf0912ab2a37026d39
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 13:54:08 2010 +0100
[BUILDROOT] [2010.02] Alternate download site is now integrated in BR (Backup site)
commit 924028e91defad2ffa386d72ed2fb6d476ae99f5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 13:34:13 2010 +0100
[BUILDROOT] Patch 050 is now ok for 2010.02
commit ed30f49574f71fdb45ea9f9112c59c1bcc7f7d92
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 3 13:33:10 2010 +0100
[BUILDROOT] Add comments to uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
commit f97a415f882047e4a4e6c49f76dc434fdd5d54f4
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 23:02:02 2010 +0100
[BUILDROOT] Definitly remove no more used 'package/mplayer/' directory
commit 5f6b3c1443f9e28dc695ecc067adf0cf6abf43ee
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 22:58:32 2010 +0100
[BUILDROOT] Ports patch 099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch to 2010.02 BR
commit 7ae4a5f9b77c562308159c0be317df981dcfa63c
Merge: 07815d94911ec69d6fc3e814957c0cd456e284b5 745321073e4a650d23720349367cd58321ea5e95
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 22:54:54 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 07815d94911ec69d6fc3e814957c0cd456e284b5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 20:17:48 2010 +0100
[BUILDROOT] Add the possibility to choose Buildroot version + regroup configurable options in main Makefile
commit ae59bc50f258f12e5b5f75c45e6915d6503250e8
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 20:15:17 2010 +0100
[BUILDROOT] Add default configs for BR 2010.02 (apf27 & only for test)
commit b23f92f7b1d8b4da5dffe07f4a04136bc7e51b10
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 17:29:52 2010 +0100
[BUILDROOT] Add patches to support upcoming 2010.02 BR version (some patches still require to be fixed)
commit 12b7ab5ca0688dab5570a2656f00268d49da0b4c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 17:18:32 2010 +0100
[BUILDROOT] Updates some patches comments
commit 5f742f7605c1d6c1cdb80a090d13325926f08db7
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 16:59:58 2010 +0100
[BUILDROOT] Make armadeus specific packages source dir relative to BR's TOPDIR and not BUILD_DIR (which is not stable between BR versions). Remove implicit uClibc dependancy while we are at it.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 14 +-
buildroot/configs/.gitignore | 2 +
.../armadeus/apf27 => configs}/apf27_defconfig | 488 ++++++++++----------
buildroot/package/armadeus/ad9889ctrl/ad9889.mk | 4 +-
.../package/armadeus/as_devices/as_devices.mk | 4 +-
.../package/armadeus/ch7024ctrl/ch70241ctrl.mk | 4 +-
buildroot/package/armadeus/demos/demos.mk | 2 +-
.../armadeus/drivers-helpers/drivers-helpers.mk | 2 +-
buildroot/package/armadeus/fpgaregs/fpgaregs.mk | 4 +-
buildroot/package/armadeus/imxregs/imxregs.mk | 4 +-
buildroot/package/armadeus/imxssi/imxssi.mk | 2 +-
.../package/armadeus/max5821ctrl/max5821ctrl.mk | 4 +-
buildroot/package/armadeus/testsuite/testsuite.mk | 4 +-
buildroot/package/fbgrab/fbgrab.mk | 2 +-
buildroot/package/mplayer/.gitignore | 4 -
.../armadeus/apf27/uClibc-0.9.30.config.arm} | 51 ++-
...s_syscall_return_value_as_standard_errors.patch | 3 +
patches/buildroot/030-gcc.patch | 2 +
...e_kernel_version_with_latest_minor_number.patch | 2 +-
...ownload_minor_patches_from_kernel_org_too.patch | 6 +-
.../{ => 2010.02}/001-add_armadeus_device.patch | 4 +-
.../buildroot/{ => 2010.02}/006-lcd4linux.patch | 0
patches/buildroot/{ => 2010.02}/017-lmbench.patch | 2 +-
patches/buildroot/{ => 2010.02}/018-allegro.patch | 2 +-
.../{ => 2010.02}/021-sdl-water-config.patch | 4 +-
.../026-jffs2root.unused_to_check} | 2 +
.../buildroot/{ => 2010.02}/034-slideshow.patch | 4 +-
.../{ => 2010.02}/038-fakeroot-bump_version.patch | 4 +-
.../{ => 2010.02}/040-linux-makefile.patch | 8 +-
patches/buildroot/{ => 2010.02}/041-fbgrab.patch | 4 +-
.../buildroot/{ => 2010.02}/042-socketcan.patch | 6 +-
.../{ => 2010.02}/047-uclibc-config.patch | 0
...ownload_minor_patches_from_kernel_org_too.patch | 16 +-
...0-linux-remove_unsupported_kernel_version.patch | 49 ++
...s_building_when_modules_compilation_fails.patch | 2 +-
.../051-u-boot.a_refaire_entierement} | 47 +-
...x-adds_linux26-patched_target_to_Makefile.patch | 0
.../053-libusb.to_fix} | 0
.../054-ntp-allow_ntpd_selection_or_not.patch | 6 +-
.../{ => 2010.02}/055-pyserial-add_package.patch | 0
.../{ => 2010.02}/057-pymysql-add_package.patch | 0
...a_work_with_eabi_and_large_file_options.to_fix} | 4 +-
...x_in_a_standalone_way_after_configuration.patch | 0
...061-mysql_client-reduce_installation_size.patch | 22 +-
.../062-add-uboot-conf-to-saved-project.to_fix} | 0
...-linux-change_board_specific_patches_name.patch | 0
.../{ => 2010.02}/072-xenomai-package.patch | 6 +-
.../{ => 2010.02}/075-dummy-fix-warning.patch | 0
.../{076-ubifs.patch => 2010.02/076-ubifs.to_fix} | 0
.../078-sdl-correct_libdir_path_in_libSDL.la.patch | 2 +-
.../{ => 2010.02}/081-adds_quake_package.patch | 2 +-
.../082-mtd-utils_with_ubi-utils.to_fix} | 0
.../{ => 2010.02}/083-adds_pygame_package.patch | 4 +-
.../{ => 2010.02}/085-adds_gpm_package.patch | 6 +-
.../{ => 2010.02}/086-bump_proftp_version.patch | 0
.../{ => 2010.02}/095-uucp-add_packages.patch | 0
...libsndfile-updates_makefile_to_autotool.to_fix} | 0
.../{ => 2010.02}/097-adds_flite_package.patch | 28 +-
...for_pld_asm_instruction_on_non_armv5_arch.patch | 4 +-
.../buildroot/2010.02/add_packages_config_entry.pl | 1 +
.../buildroot/{ => 2010.02}/cleanup_buildroot.sh | 4 +-
61 files changed, 473 insertions(+), 378 deletions(-)
create mode 100644 buildroot/configs/.gitignore
copy buildroot/{target/device/armadeus/apf27 => configs}/apf27_defconfig (72%)
delete mode 100644 buildroot/package/mplayer/.gitignore
copy buildroot/{local/apf9328_test/uclibc-0.9.29.config => target/device/armadeus/apf27/uClibc-0.9.30.config.arm} (80%)
copy patches/buildroot/{ => 2010.02}/001-add_armadeus_device.patch (81%)
copy patches/buildroot/{ => 2010.02}/006-lcd4linux.patch (100%)
copy patches/buildroot/{ => 2010.02}/017-lmbench.patch (92%)
copy patches/buildroot/{ => 2010.02}/018-allegro.patch (92%)
copy patches/buildroot/{ => 2010.02}/021-sdl-water-config.patch (88%)
copy patches/buildroot/{026-jffs2root.patch => 2010.02/026-jffs2root.unused_to_check} (96%)
copy patches/buildroot/{ => 2010.02}/034-slideshow.patch (88%)
copy patches/buildroot/{ => 2010.02}/038-fakeroot-bump_version.patch (75%)
copy patches/buildroot/{ => 2010.02}/040-linux-makefile.patch (89%)
copy patches/buildroot/{ => 2010.02}/041-fbgrab.patch (88%)
copy patches/buildroot/{ => 2010.02}/042-socketcan.patch (81%)
copy patches/buildroot/{ => 2010.02}/047-uclibc-config.patch (100%)
copy patches/buildroot/{ => 2010.02}/049-linux-download_minor_patches_from_kernel_org_too.patch (64%)
create mode 100644 patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch
copy patches/buildroot/{ => 2010.02}/050-linux-stops_building_when_modules_compilation_fails.patch (98%)
copy patches/buildroot/{051-u-boot.patch => 2010.02/051-u-boot.a_refaire_entierement} (86%)
copy patches/buildroot/{ => 2010.02}/052-linux-adds_linux26-patched_target_to_Makefile.patch (100%)
copy patches/buildroot/{053-libusb.patch => 2010.02/053-libusb.to_fix} (100%)
copy patches/buildroot/{ => 2010.02}/054-ntp-allow_ntpd_selection_or_not.patch (88%)
copy patches/buildroot/{ => 2010.02}/055-pyserial-add_package.patch (100%)
copy patches/buildroot/{ => 2010.02}/057-pymysql-add_package.patch (100%)
copy patches/buildroot/{058-makes_alsa_work_with_eabi_and_large_file_options.patch => 2010.02/058-makes_alsa_work_with_eabi_and_large_file_options.to_fix} (85%)
copy patches/buildroot/{ => 2010.02}/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch (100%)
copy patches/buildroot/{ => 2010.02}/061-mysql_client-reduce_installation_size.patch (78%)
copy patches/buildroot/{062-add-uboot-conf-to-saved-project.patch => 2010.02/062-add-uboot-conf-to-saved-project.to_fix} (100%)
copy patches/buildroot/{ => 2010.02}/071-linux-change_board_specific_patches_name.patch (100%)
copy patches/buildroot/{ => 2010.02}/072-xenomai-package.patch (92%)
copy patches/buildroot/{ => 2010.02}/075-dummy-fix-warning.patch (100%)
copy patches/buildroot/{076-ubifs.patch => 2010.02/076-ubifs.to_fix} (100%)
copy patches/buildroot/{ => 2010.02}/078-sdl-correct_libdir_path_in_libSDL.la.patch (97%)
copy patches/buildroot/{ => 2010.02}/081-adds_quake_package.patch (99%)
copy patches/buildroot/{082-mtd-utils_with_ubi-utils.patch => 2010.02/082-mtd-utils_with_ubi-utils.to_fix} (100%)
copy patches/buildroot/{ => 2010.02}/083-adds_pygame_package.patch (99%)
copy patches/buildroot/{ => 2010.02}/085-adds_gpm_package.patch (98%)
copy patches/buildroot/{ => 2010.02}/086-bump_proftp_version.patch (100%)
copy patches/buildroot/{ => 2010.02}/095-uucp-add_packages.patch (100%)
copy patches/buildroot/{096-libsndfile-updates_makefile_to_autotool.patch => 2010.02/096-libsndfile-updates_makefile_to_autotool.to_fix} (100%)
copy patches/buildroot/{ => 2010.02}/097-adds_flite_package.patch (76%)
copy patches/buildroot/{ => 2010.02}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (77%)
create mode 120000 patches/buildroot/2010.02/add_packages_config_entry.pl
copy patches/buildroot/{ => 2010.02}/cleanup_buildroot.sh (77%)
diff --git a/Makefile b/Makefile
index 6aa728b..6ffb30e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,21 +22,25 @@
# You shouldn't need to mess with anything beyond this point...
#--------------------------------------------------------------
-BUILDROOT_DIR = buildroot
include ./Makefile.in
-BUILDROOT_NAME=buildroot
-BUILDROOT_FILE_PATH:=downloads
+#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+#BUILDROOT_VERSION:=20100129
+#BUILDROOT_PATCH_DIR = patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
-BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
+BUILDROOT_PATCH_DIR = patches/buildroot
+#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
+
ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
+BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
+BUILDROOT_DIR = buildroot
PATCH_DIR = patches
-BUILDROOT_PATCH_DIR = patches/buildroot
+BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git -xf
ARMADEUS_ENV_FILE=armadeus_env.sh
diff --git a/buildroot/configs/.gitignore b/buildroot/configs/.gitignore
new file mode 100644
index 0000000..4113dbc
--- /dev/null
+++ b/buildroot/configs/.gitignore
@@ -0,0 +1,2 @@
+*_defconfig
+!/apf*
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/configs/apf27_defconfig
similarity index 72%
copy from buildroot/target/device/armadeus/apf27/apf27_defconfig
copy to buildroot/configs/apf27_defconfig
index a7a1ece..b1d0160 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Sun Jan 31 18:25:35 2010
+# Wed Feb 3 13:49:16 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="0.10.0-svn"
+BR2_VERSION="2010.02-git"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -16,53 +16,47 @@ BR2_arm=y
# BR2_mipsel is not set
# BR2_nios2 is not set
# BR2_powerpc is not set
-# BR2_s390 is not set
# BR2_sh is not set
# BR2_sh64 is not set
# BR2_sparc is not set
# BR2_sparc64 is not set
# BR2_x86_64 is not set
+# BR2_xtensa is not set
# BR2_generic_arm is not set
-# BR2_arm600 is not set
+# BR2_arm7tdmi is not set
# BR2_arm610 is not set
-# BR2_arm620 is not set
# BR2_arm710 is not set
-# BR2_arm7tdmi is not set
-# BR2_arm710t is not set
# BR2_arm720t is not set
-# BR2_arm740t is not set
# BR2_arm920t is not set
# BR2_arm922t is not set
-# BR2_arm926t is not set
-BR2_arm926ej_s=y
+BR2_arm926t=y
# BR2_arm10t is not set
# BR2_arm1136jf_s is not set
# BR2_arm1176jz_s is not set
# BR2_arm1176jzf_s is not set
+
+#
+# cortex-A8 needs gcc >= 4.4.x
+#
+# BR2_cortex_a8 is not set
# BR2_sa110 is not set
# BR2_sa1100 is not set
# BR2_xscale is not set
# BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM926EJ_S"
-# BR2_ARM_OABI is not set
+BR2_ARM_TYPE="ARM926T"
BR2_ARM_EABI=y
+# BR2_ARM_OABI is not set
BR2_ARCH="arm"
BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="arm926ej-s"
+BR2_GCC_TARGET_TUNE="arm9tdmi"
BR2_GCC_TARGET_ARCH="armv5te"
+BR2_GCC_TARGET_ABI="aapcs-linux"
#
# Target options
#
#
-# Project Options
-#
-BR2_PROJECT="apf27"
-BR2_HOSTNAME="armadeus"
-BR2_BANNER="Welcome to the Armadeus development environment."
-
-#
# Preset Devices
#
BR2_TARGET_ARMADEUS=y
@@ -82,59 +76,42 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="64"
# BR2_TARGET_ARMLTD is not set
# BR2_TARGET_ATMEL is not set
# BR2_TARGET_KWIKBYTE is not set
-# BR2_TARGET_SHARP is not set
-
-#
-# Generic Architecture support
-#
-# BR2_TARGET_ARM is not set
-
-#
-# Generic System Support
-#
-# BR2_TARGET_GENERIC_ACCESS_POINT is not set
-# BR2_TARGET_GENERIC_FIREWALL is not set
-# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
+BR2_TARGET_GENERIC_HOSTNAME="armadeus"
+BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
+# BR2_TARGET_GENERIC_GETTY is not set
#
# Build options
#
-BR2_PRIMARY_SITE=""
-BR2_ALTERNATE_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_WGET="wget --passive-ftp"
BR2_SVN_CO="svn co"
BR2_SVN_UP="svn up"
+BR2_BZR_CO="bzr co"
+BR2_BZR_UP="bzr up"
BR2_GIT="git clone"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
+BR2_DL_DIR="/local/downloads"
+BR2_COPYTO=""
#
# Mirrors and Download locations
#
+BR2_PRIMARY_SITE=""
+BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_SOURCEFORGE_MIRROR="easynews"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-
-#
-# Atmel Mirrors
-#
-BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
-BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-# BR2_FPU_SUFFIX is not set
-BR2_TOPDIR_PREFIX=""
-BR2_TOPDIR_SUFFIX=""
-BR2_ROOTFS_PREFIX="$(BR2_BOARD_NAME)-rootfs"
-BR2_ROOTFS_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
+BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
+BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
# BR2_STRIP_strip is not set
BR2_STRIP_sstrip=y
@@ -156,82 +133,70 @@ BR2_UPDATE_CONFIG=y
#
BR2_TOOLCHAIN_BUILDROOT=y
# BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
#
# Kernel Header Options
#
-# BR2_KERNEL_HEADERS_2_4_31 is not set
-# BR2_KERNEL_HEADERS_2_6_20_4 is not set
-# BR2_KERNEL_HEADERS_2_6_20 is not set
-# BR2_KERNEL_HEADERS_2_6_21_5 is not set
-# BR2_KERNEL_HEADERS_2_6_21 is not set
-# BR2_KERNEL_HEADERS_2_6_22_1 is not set
-# BR2_KERNEL_HEADERS_2_6_22_10 is not set
-# BR2_KERNEL_HEADERS_2_6_22 is not set
-# BR2_KERNEL_HEADERS_2_6_23 is not set
-# BR2_KERNEL_HEADERS_2_6_24 is not set
-# BR2_KERNEL_HEADERS_2_6_25 is not set
# BR2_KERNEL_HEADERS_2_6_26 is not set
# BR2_KERNEL_HEADERS_2_6_27 is not set
-BR2_KERNEL_HEADERS_2_6_29=y
+# BR2_KERNEL_HEADERS_2_6_28 is not set
+# BR2_KERNEL_HEADERS_2_6_29 is not set
+# BR2_KERNEL_HEADERS_2_6_30 is not set
+# BR2_KERNEL_HEADERS_2_6_31 is not set
+# BR2_KERNEL_HEADERS_2_6_32 is not set
+BR2_KERNEL_HEADERS_VERSION=y
# BR2_KERNEL_HEADERS_SNAP is not set
+BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
#
# uClibc Options
#
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
-BR2_UCLIBC_VERSION_0_9_29=y
+# BR2_UCLIBC_VERSION_0_9_29 is not set
+# BR2_UCLIBC_VERSION_0_9_30 is not set
+# BR2_UCLIBC_VERSION_0_9_30_1 is not set
+BR2_UCLIBC_VERSION_0_9_30_2=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc.config.arm "
-# BR2_ENABLE_LOCALE is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
+BR2_UCLIBC_VERSION_STRING="0.9.30.2"
+BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
# BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
#
# Binutils Options
#
# BR2_BINUTILS_VERSION_2_17 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
-# BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
-BR2_BINUTILS_VERSION="2.18"
+# BR2_BINUTILS_VERSION_2_18 is not set
+# BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+# BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
+# BR2_BINUTILS_VERSION_2_19_1 is not set
+BR2_BINUTILS_VERSION_2_20=y
+BR2_BINUTILS_VERSION="2.20"
BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
#
# GCC Options
#
-# BR2_GCC_VERSION_3_4_6 is not set
-# BR2_GCC_VERSION_4_0_4 is not set
# BR2_GCC_VERSION_4_1_2 is not set
-BR2_GCC_VERSION_4_2_1=y
+# BR2_GCC_VERSION_4_2_1 is not set
# BR2_GCC_VERSION_4_2_2 is not set
+# BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 is not set
# BR2_GCC_VERSION_4_2_3 is not set
# BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_1 is not set
+# BR2_GCC_VERSION_4_3_2 is not set
+# BR2_GCC_VERSION_4_3_3 is not set
+# BR2_GCC_VERSION_4_3_4 is not set
+BR2_GCC_VERSION_4_4_X=y
+# BR2_GCC_VERSION_SNAP is not set
BR2_GCC_SUPPORTS_SYSROOT=y
-# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.1"
+BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
+BR2_GCC_VERSION="4.4.3"
BR2_TOOLCHAIN_SYSROOT=y
# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_GCC_CROSS_CXX=y
# BR2_GCC_CROSS_FORTRAN is not set
-BR2_INSTALL_LIBSTDCPP=y
# BR2_INSTALL_LIBGCJ is not set
# BR2_INSTALL_OBJC is not set
# BR2_INSTALL_FORTRAN is not set
@@ -241,7 +206,7 @@ BR2_GCC_SHARED_LIBGCC=y
# Ccache Options
#
BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
#
# Gdb Options
@@ -249,56 +214,65 @@ BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
# BR2_PACKAGE_GDB is not set
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-# BR2_GDB_VERSION_6_2_1 is not set
-# BR2_GDB_VERSION_6_3 is not set
# BR2_GDB_VERSION_6_4 is not set
# BR2_GDB_VERSION_6_5 is not set
# BR2_GDB_VERSION_6_6 is not set
BR2_GDB_VERSION_6_7_1=y
+# BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 is not set
# BR2_GDB_VERSION_6_8 is not set
-# BR2_GDB_VERSION_SNAPSHOT is not set
BR2_GDB_VERSION="6.7.1"
#
# Common Toolchain Options
#
-# BR2_ELF2FLT is not set
-# BR2_MKLIBS is not set
-BR2_PACKAGE_SSTRIP_TARGET=y
-BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
+# BR2_ENABLE_LOCALE is not set
+# BR2_ENABLE_LOCALE_PURGE is not set
BR2_USE_WCHAR=y
+BR2_PREFER_SOFT_FLOAT=y
BR2_SOFT_FLOAT=y
+# BR2_USE_SSP is not set
+# BR2_PTHREADS_NONE is not set
+# BR2_PTHREADS is not set
+BR2_PTHREADS_OLD=y
+# BR2_PTHREADS_NATIVE is not set
+# BR2_PROGRAM_INVOCATION is not set
+BR2_GCC_CROSS_CXX=y
+BR2_INSTALL_LIBSTDCPP=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
+# BR2_ELF2FLT is not set
+# BR2_MKLIBS is not set
+BR2_PACKAGE_SSTRIP_TARGET=y
+BR2_PACKAGE_SSTRIP_HOST=y
+BR2_ENABLE_MULTILIB=y
BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
#
# Package Selection for the target
#
BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_2_2_1 is not set
-# BR2_BUSYBOX_VERSION_1_6_1 is not set
-# BR2_BUSYBOX_VERSION_1_7_X is not set
-# BR2_BUSYBOX_VERSION_1_8_X is not set
-# BR2_BUSYBOX_VERSION_1_9_X is not set
-# BR2_BUSYBOX_VERSION_1_10_X is not set
-# BR2_BUSYBOX_VERSION_1_11_X is not set
-BR2_BUSYBOX_VERSION_1_12_X=y
+# BR2_BUSYBOX_VERSION_1_12_X is not set
+# BR2_BUSYBOX_VERSION_1_13_X is not set
+# BR2_BUSYBOX_VERSION_1_14_X is not set
+# BR2_BUSYBOX_VERSION_1_15_X is not set
+BR2_BUSYBOX_VERSION_1_16_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.12.1"
+BR2_BUSYBOX_VERSION="1.16.0"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox.config "
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_BUSYBOX_SKELETON is not set
#
# The minimum needed to build a uClibc development system
#
# BR2_PACKAGE_FLEX is not set
-# BR2_PACKAGE_GCC_TARGET is not set
+
+#
+# native toolchain needs development files in target filesystem
+#
# BR2_PACKAGE_MAKE is not set
#
@@ -321,20 +295,20 @@ BR2_HOST_FAKEROOT=y
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
# BR2_PACKAGE_OPROFILE is not set
-BR2_PACKAGE_PKGCONFIG=y
-# BR2_READLINE is not set
+# BR2_PACKAGE_PKG_CONFIG is not set
+# BR2_PACKAGE_READLINE is not set
# BR2_PACKAGE_PCRE is not set
#
# Armadeus specific packages
#
# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
#
# bluez not available (need dbus)
#
# BR2_PACKAGE_MESALIB is not set
+# BR2_PACKAGE_FBTEST is not set
#
# Armadeus specific tools/utilities
@@ -349,7 +323,6 @@ BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_FBTEST is not set
# BR2_PACKAGE_SNES9X is not set
#
@@ -361,6 +334,7 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_BSDIFF is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_CUSTOMIZE is not set
+# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_GAMIN is not set
# BR2_PACKAGE_ICU is not set
@@ -370,11 +344,12 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_LIBDAEMON is not set
# BR2_PACKAGE_LIBELF is not set
# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFLOAT is not set
# BR2_PACKAGE_LIBGCRYPT is not set
# BR2_PACKAGE_LIBGPG_ERROR is not set
# BR2_PACKAGE_LIBICONV is not set
+# BR2_PACKAGE_LIBIDN is not set
# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBOIL is not set
# BR2_PACKAGE_LIBSYSFS is not set
# BR2_PACKAGE_LMBENCH is not set
# BR2_PACKAGE_LOCKFILE_PROGS is not set
@@ -382,21 +357,31 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_LSOF is not set
# BR2_PACKAGE_LTP-TESTSUITE is not set
# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_LTT is not set
# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NG_SPICE_REWORK is not set
# BR2_PACKAGE_POPT is not set
# BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
# BR2_PACKAGE_XENOMAI is not set
-# BR2_DATABASE_SUPPORT is not set
-BR2_TEXTEDIT_SUPPORT=y
+
+#
+# Database
+#
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+# BR2_PACKAGE_SQLITE is not set
+
+#
+# Text editors
+#
# BR2_PACKAGE_ED is not set
BR2_PACKAGE_NANO=y
# BR2_PACKAGE_UEMACS is not set
-BR2_NETWORK_SUPPORT=y
+
+#
+# Networking
+#
#
# Networking applications
@@ -404,45 +389,45 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_ETHTOOL is not set
# BR2_PACKAGE_HASERL is not set
+# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
# BR2_PACKAGE_IPERF is not set
# BR2_PACKAGE_IPROUTE2 is not set
-
-#
-# ipsec-tools - disabled (requires openssl, flex and the flex library (libfl.a) )
-#
+# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPTABLES is not set
+# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
# BR2_PACKAGE_L2TP is not set
# BR2_PACKAGE_LIBCGI is not set
# BR2_PACKAGE_LIBCGICC is not set
# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBSOUP is not set
# BR2_PACKAGE_LIBUPNP is not set
# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MICROCOM is not set
# BR2_PACKAGE_MIIDIAG is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MUTT is not set
# BR2_PACKAGE_NBD is not set
# BR2_PACKAGE_NCFTP is not set
# BR2_PACKAGE_NEON is not set
-# BR2_PACKAGE_NETKITBASE is not set
-# BR2_PACKAGE_NETKITTELNET is not set
# BR2_PACKAGE_NETPLUG is not set
# BR2_PACKAGE_NETSNMP is not set
+# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
@@ -452,32 +437,23 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
# BR2_PACKAGE_OPENVPN is not set
-# BR2_PACKAGE_OPENSWAN is not set
BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
# BR2_PACKAGE_RP_PPPOE is not set
# BR2_PACKAGE_PPTP_LINUX is not set
# BR2_PACKAGE_PROFTPD is not set
-
-#
-# quagga suite
-#
-# BR2_PACKAGE_QUAGGA_ZEBRA is not set
-# BR2_PACKAGE_QUAGGA_BGPD is not set
-# BR2_PACKAGE_QUAGGA_RIPD is not set
-# BR2_PACKAGE_QUAGGA_RIPNGD is not set
-# BR2_PACKAGE_QUAGGA_OSPFD is not set
-# BR2_PACKAGE_QUAGGA_OSPF6D is not set
-# BR2_PACKAGE_QUAGGA_WATCHQUAGGA is not set
-# BR2_PACKAGE_QUAGGA_ISISD is not set
+# BR2_PACKAGE_QUAGGA is not set
# BR2_PACKAGE_RSYNC is not set
# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SOCKETCAN is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_TCPDUMP is not set
# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_TFTPD is not set
+# BR2_PACKAGE_TCPREPLAY is not set
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
@@ -486,14 +462,17 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_BLOCKDEV_SUPPORT=y
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
+
+#
+# Hardware handling / blockdevices and filesystem maintenance
+#
#
# dbus not available (need expat or libxml2)
#
-# BR2_PACKAGE_DEVMEM2 is not set
-# BR2_PACKAGE_DM is not set
# BR2_PACKAGE_DMRAID is not set
+# BR2_PACKAGE_DOSFSTOOLS is not set
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
@@ -501,6 +480,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GVFS is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
@@ -514,12 +494,8 @@ BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_LVM2 is not set
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MKDOSFS is not set
BR2_PACKAGE_MTD=y
-# BR2_PACKAGE_MTD_UTILS is not set
-# BR2_PACKAGE_MTD_20061007 is not set
-# BR2_PACKAGE_MTD_20050122 is not set
-BR2_PACKAGE_MTD_UTILS_20090824GIT=y
+BR2_PACKAGE_MTD_UTILS=y
# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
@@ -532,6 +508,8 @@ BR2_PACKAGE_MTD_FLASH_ERASE=y
BR2_PACKAGE_MTD_FLASH_ERASEALL=y
BR2_PACKAGE_MTD_FLASH_INFO=y
BR2_PACKAGE_MTD_FLASH_LOCK=y
+# BR2_PACKAGE_MTD_FLASH_OTP_DUMP is not set
+# BR2_PACKAGE_MTD_FLASH_OTP_INFO is not set
BR2_PACKAGE_MTD_FLASH_UNLOCK=y
# BR2_PACKAGE_MTD_FTL_CHECK is not set
# BR2_PACKAGE_MTD_FTL_FORMAT is not set
@@ -541,28 +519,44 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
BR2_PACKAGE_MTD_NANDTEST=y
BR2_PACKAGE_MTD_NANDWRITE=y
-# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
# BR2_PACKAGE_MTD_NFTLDUMP is not set
+# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
+# BR2_PACKAGE_MTD_RECV_IMAGE is not set
+# BR2_PACKAGE_MTD_RFDDUMP is not set
+# BR2_PACKAGE_MTD_RFDFORMAT is not set
+# BR2_PACKAGE_MTD_SERVE_IMAGE is not set
BR2_PACKAGE_MTD_SUMTOOL=y
-BR2_PACKAGE_MTD_UBIATTACH=y
-BR2_PACKAGE_MTD_UBICRC32=y
-BR2_PACKAGE_MTD_UBIDETACH=y
-BR2_PACKAGE_MTD_UBIMKVOL=y
-BR2_PACKAGE_MTD_UBINFO=y
-BR2_PACKAGE_MTD_UBIRMVOL=y
-BR2_PACKAGE_MTD_UBIUPDATEVOL=y
-# BR2_PACKAGE_NTFS-3G is not set
+# BR2_PACKAGE_NTFS_3G is not set
+# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
-# BR2_PACKAGE_RAIDTOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_USB_MODESWITCH is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
-BR2_AUDIO_SUPPORT=y
+
+#
+# Audio and video libraries and applications
+#
BR2_PACKAGE_ALSA_LIB=y
+
+#
+# ALSA lib selection
+#
+BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
+BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_ALOAD=y
+BR2_PACKAGE_ALSA_LIB_MIXER=y
+BR2_PACKAGE_ALSA_LIB_PCM=y
+BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
+BR2_PACKAGE_ALSA_LIB_HWDEP=y
+BR2_PACKAGE_ALSA_LIB_SEQ=y
+BR2_PACKAGE_ALSA_LIB_ALISP=y
+BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
BR2_PACKAGE_ALSA_UTILS=y
#
@@ -587,21 +581,33 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# asterisk - disabled (required openssl and mpg123)
#
# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LIBCDAUDIO is not set
+# BR2_PACKAGE_LIBDVDREAD is not set
+# BR2_PACKAGE_LIBDVDNAV is not set
# BR2_PACKAGE_LIBID3TAG is not set
# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMMS is not set
+# BR2_PACKAGE_LIBMPD is not set
# BR2_PACKAGE_LIBOGG is not set
# BR2_PACKAGE_LIBSNDFILE is not set
-
-#
-# libvorbis requires the package libogg to build
-#
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
# BR2_PACKAGE_MADPLAY is not set
# BR2_PACKAGE_MPG123 is not set
-BR2_PACKAGE_MPG123_ALSA=y
+# BR2_PACKAGE_MPLAYER is not set
# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_SWFDEC is not set
# BR2_PACKAGE_FESTIVAL is not set
# BR2_PACKAGE_FLITE is not set
-BR2_GRAPHIC_SUPPORT=y
+# BR2_PACKAGE_TAGLIB is not set
+# BR2_PACKAGE_TREMOR is not set
+# BR2_PACKAGE_VLC is not set
+
+#
+# Graphic libraries and applications (graphic/text)
+#
#
# text rendering libraries
@@ -610,7 +616,6 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_SLANG is not set
@@ -630,6 +635,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
# BR2_PACKAGE_PIXMAN is not set
# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_TIFF is not set
@@ -653,24 +659,14 @@ BR2_PACKAGE_NCURSES=y
#
# other GUIs
#
-# BR2_PACKAGE_QTOPIA4 is not set
-
-#
-# X Window System server
-#
-BR2_PACKAGE_XSERVER_none=y
-# BR2_PACKAGE_XSERVER_xorg is not set
-
-#
-# xorg requires a toolchain with LOCALE and WCHAR support
-#
-# BR2_PACKAGE_XSERVER_tinyx is not set
-BR2_X11_PREFIX="/usr"
+# BR2_PACKAGE_QT is not set
+# BR2_PACKAGE_XORG7 is not set
#
# X libraries and helper libraries
#
# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_LIBDRM is not set
# BR2_PACKAGE_LIBERATION is not set
@@ -685,50 +681,66 @@ BR2_PACKAGE_TSLIB=y
#
# X Window managers
#
-# BR2_PACKAGE_MATCHBOX is not set
#
# X applications
#
-# BR2_PACKAGE_ALSAMIXERGUI is not set
+# BR2_PACKAGE_GOB2 is not set
+# BR2_PACKAGE_SYLPHEED is not set
+# BR2_PACKAGE_XPDF is not set
#
-# dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
+# Compressors / decompressors
#
-# BR2_PACKAGE_GQVIEW is not set
-# BR2_PACKAGE_LEAFPAD is not set
+# BR2_PACKAGE_LIBARCHIVE is not set
+BR2_PACKAGE_LZO=y
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_LZMA is not set
+BR2_PACKAGE_ZLIB=y
#
-# midori - disabled (requires Xorg(7))
+# Package managers
#
-# BR2_PACKAGE_PCMANFM is not set
-# BR2_PACKAGE_SYLPHEED is not set
-# BR2_PACKAGE_TORSMO is not set
-# BR2_PACKAGE_X11VNC is not set
-# BR2_PACKAGE_XPDF is not set
-# BR2_PACKAGE_XSTROKE is not set
-# BR2_PACKAGE_XVKBD is not set
+# BR2_PACKAGE_IPKG is not set
+# BR2_PACKAGE_PORTAGE is not set
#
-# Video libraries/codecs and applications
+# Interpreter languages / Scripting
#
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_VLC is not set
-BR2_COMPRESSOR_SUPPORT=y
-BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
-# BR2_PACKAGE_LZMA_HOST is not set
-BR2_PACKAGE_ZLIB=y
-# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
-# BR2_PACKAGEMGRS_SUPPORT is not set
-# BR2_SCRIPTING_SUPPORT is not set
-# BR2_XML_SUPPORT is not set
-# BR2_JAVA_SUPPORT is not set
-# BR2_GAMES is not set
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
+# BR2_PACKAGE_PHP is not set
+
+#
+# XML handling
+#
+# BR2_PACKAGE_EXPAT is not set
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_LIBXML2 is not set
+# BR2_PACKAGE_LIBXSLT is not set
+# BR2_PACKAGE_XERCES is not set
+
+#
+# Java
+#
+# BR2_PACKAGE_CLASSPATH is not set
+
+#
+# Games
+#
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_PRBOOM is not set
+# BR2_PACKAGE_SDLQUAKE is not set
#
# Target filesystem options
#
+BR2_ROOTFS_PREFIX="$(BR2_BOARD_NAME)-rootfs"
+BR2_ROOTFS_SUFFIX=""
+BR2_ROOTFS_POST_BUILD_SCRIPT=""
#
# filesystem for target device
@@ -739,10 +751,12 @@ BR2_PACKAGE_ZLIB=y
BR2_TARGET_ROOTFS_JFFS2=y
# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
-BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
+# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+# BR2_TARGET_ROOTFS_JFFS2_FLASH_128 is not set
# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
-BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000
+BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x800
BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
# BR2_JFFS2_TARGET_SREC is not set
@@ -750,11 +764,9 @@ BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
BR2_TARGET_ROOTFS_JFFS2_LE=y
# BR2_TARGET_ROOTFS_JFFS2_BE is not set
-# BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
# BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
-# BR2_TARGET_ROOTFS_UBIFS is not set
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -772,17 +784,21 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_UBOOT_2009_11=y
+# BR2_TARGET_UBOOT_2009_08 is not set
+# BR2_TARGET_UBOOT_2009_06 is not set
+# BR2_TARGET_UBOOT_2009_03 is not set
+# BR2_TARGET_UBOOT_2009_01 is not set
+# BR2_TARGET_UBOOT_2008_10 is not set
+# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
+BR2_UBOOT_VERSION="2009.11"
+BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
+# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-BR2_TARGET_UBOOT_SERVERIP=""
-BR2_TARGET_UBOOT_IPADDR=""
-BR2_TARGET_UBOOT_GATEWAY=""
-BR2_TARGET_UBOOT_NETMASK=""
-BR2_TARGET_UBOOT_ETHADDR=""
# BR2_TARGET_UBOOT_SILENT is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
# BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_COPYTO=""
+# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
#
# Kernel
@@ -790,33 +806,33 @@ BR2_TARGET_UBOOT_COPYTO=""
# BR2_KERNEL_none is not set
BR2_KERNEL_LINUX_ADVANCED=y
# BR2_KERNEL_LINUX is not set
-# BR2_KERNEL_HURD is not set
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
BR2_PACKAGE_LINUX_FORMAT="uImage"
+BR2_KERNEL_CURRENT_VERSION="2.6.30.2"
+BR2_KERNEL_LATEST_2_6_30="2"
+BR2_KERNEL_LATEST_2_6_29="6"
+BR2_KERNEL_LATEST_2_6_28="10"
+BR2_KERNEL_LATEST_2_6_27="27"
+BR2_KERNEL_LATEST_2_6_26="8"
+BR2_KERNEL_LATEST_2_6_25="19"
+BR2_KERNEL_LATEST_2_6_24="7"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
-BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
+BR2_KERNEL_NEXT_VERSION="2.6.30"
BR2_KERNEL_THIS_VERSION="2.6.29"
-BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
+BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
-BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
+BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)"
# BR2_LINUX_2_6_STABLE is not set
+# BR2_LINUX_2_6_30 is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
# BR2_LINUX_2_6_27 is not set
# BR2_LINUX_2_6_26 is not set
# BR2_LINUX_2_6_25 is not set
# BR2_LINUX_2_6_24 is not set
-# BR2_LINUX_2_6_23 is not set
-# BR2_LINUX_2_6_22_10 is not set
-# BR2_LINUX_2_6_22_1 is not set
-# BR2_LINUX_2_6_22 is not set
-# BR2_LINUX_2_6_21_7 is not set
-# BR2_LINUX_2_6_21_5 is not set
-# BR2_LINUX_2_6_21 is not set
-# BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_18 is not set
+# BR2_LINUX_2_6_31 is not set
# BR2_LINUX26_CUSTOM is not set
#
@@ -835,7 +851,6 @@ BR2_KERNEL_ADD_MINORPATCH=y
BR2_KERNEL_ADD_PATCH=y
BR2_KERNEL_MINORLEVEL="6"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
-BR2_LINUX_BOARD_PATCH=y
BR2_LINUX_BSP_PATCH=""
BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
@@ -849,9 +864,6 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
BR2_PACKAGE_LINUX_USE_KCONFIG=y
# BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
# BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-# BR2_MAKE_XCONFIG is not set
-BR2_MAKE_MENUCONFIG=y
-BR2_KERNEL_CONFIG_METHOD="menuconfig"
# BR2_LINUX_BIN_BZIMAGE is not set
BR2_LINUX_BIN_UIMAGE=y
# BR2_LINUX_BIN_VMLINUX is not set
diff --git a/buildroot/package/armadeus/ad9889ctrl/ad9889.mk b/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
index 6ff0cef..8245c7d 100644
--- a/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
+++ b/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
@@ -5,7 +5,7 @@
#############################################################
AD9889CTRL_VER:=1.0
-AD9889CTRL_SOURCE:=$(BUILD_DIR)/../../target/packages/ad9889ctrl
+AD9889CTRL_SOURCE:=$(TOPDIR)/../target/packages/ad9889ctrl
AD9889CTRL_DIR:=$(BUILD_DIR)/ad9889ctrl-$(AD9889CTRL_VER)
AD9889CTRL_CAT:=zcat
AD9889CTRL_BINARY:=ad9889ctrl
@@ -22,7 +22,7 @@ $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY): $(AD9889CTRL_DIR)/$(AD9889CTRL_BINARY
install -D $< $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
-ad9889ctrl: uclibc $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
+ad9889ctrl: $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
ad9889ctrl-clean:
rm -f $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 9183580..d1adee1 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -7,7 +7,7 @@
PYTHON:=python2.4
AS_DEVICES_VER:=1.0
-AS_DEVICES_SOURCE:=$(BUILD_DIR)/../../target/packages/as_devices
+AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
AS_DEVICES_CAT:=zcat
@@ -69,7 +69,7 @@ $(AS_DEVICES_DIR)/python/AsDevices/wrappers/$(AS_DEVICES_PYTHON_BINARY): $(AS_DE
endif
-as_devices: uclibc $(AS_DEVICES_BINARIES)
+as_devices: $(AS_DEVICES_BINARIES)
as_devices-clean:
rm -f $(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
diff --git a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
index 5711e50..ccd7376 100644
--- a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
+++ b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
@@ -5,7 +5,7 @@
#############################################################
CH7024CTRL_VER:=1.0
-CH7024CTRL_SOURCE:=$(BUILD_DIR)/../../target/packages/ch7024ctrl
+CH7024CTRL_SOURCE:=$(TOPDIR)/../target/packages/ch7024ctrl
CH7024CTRL_DIR:=$(BUILD_DIR)/ch7024ctrl-$(CH7024CTRL_VER)
CH7024CTRL_CAT:=zcat
CH7024CTRL_BINARY:=ch7024
@@ -26,7 +26,7 @@ $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY): $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
cp $(CH7024CTRL_DIR)/$(CH7024CTRL_CONF_FILES) $(TARGET_DIR)/$(CH7024CTRL_TARGET_DIR)
-ch7024ctrl: uclibc $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
+ch7024ctrl: $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
ch7024ctrl-clean:
rm -f $(TARGET_DIR)/$(CH7024CTRL_TARGET_DIR)/$(CH7024CTRL_CONF_FILES)
diff --git a/buildroot/package/armadeus/demos/demos.mk b/buildroot/package/armadeus/demos/demos.mk
index b268d1f..75ee690 100644
--- a/buildroot/package/armadeus/demos/demos.mk
+++ b/buildroot/package/armadeus/demos/demos.mk
@@ -5,7 +5,7 @@
#############################################################
ARMADEUS-DEMOS_VER:=1.0
-ARMADEUS-DEMOS_SOURCE:=$(BUILD_DIR)/../../target/demos
+ARMADEUS-DEMOS_SOURCE:=$(TOPDIR)/../target/demos
ARMADEUS-DEMOS_DIR:=$(BUILD_DIR)/armadeus-demos-$(ARMADEUS-DEMOS_VER)
ARMADEUS-DEMOS_TARGET_DIR:=$(TARGET_DIR)/usr/local/bin
ARMADEUS-DEMOS_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share
diff --git a/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
index c333268..09fbd46 100644
--- a/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
+++ b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
@@ -4,7 +4,7 @@
#
#############################################################
-ARMADEUS-DRIVERS_SOURCE_DIR:=$(BUILD_DIR)/../../target/linux/modules
+ARMADEUS-DRIVERS_SOURCE_DIR:=$(TOPDIR)/../target/linux/modules
ARMADEUS-DRIVERS-HELPERS_TARGET_DIR:=$(TARGET_DIR)/usr/bin
diff --git a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
index c0363a6..3a7782b 100644
--- a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
+++ b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
@@ -5,7 +5,7 @@
#############################################################
FPGAREGS_VER:=1.0
-FPGAREGS_SOURCE:=$(BUILD_DIR)/../../target/linux/debug/fpgaregs/
+FPGAREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/fpgaregs/
FPGAREGS_DIR:=$(BUILD_DIR)/fpgaregs-$(FPGAREGS_VER)
FPGAREGS_CAT:=zcat
ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
@@ -26,7 +26,7 @@ $(TARGET_DIR)/$(FPGAREGS_TARGET_BINARY): $(FPGAREGS_DIR)/$(FPGAREGS_BINARY)
install -D $< $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FPGAREGS_TARGET_BINARY)
-fpgaregs: uclibc $(TARGET_DIR)/$(FPGAREGS_TARGET_BINARY)
+fpgaregs: $(TARGET_DIR)/$(FPGAREGS_TARGET_BINARY)
fpgaregs-clean:
rm -f $(TARGET_DIR)/$(FPGAREGS_TARGET_BINARY)
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index bcdf975..cf53e19 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -5,7 +5,7 @@
#############################################################
IMXREGS_VER:=1.0
-IMXREGS_SOURCE:=$(BUILD_DIR)/../../target/linux/debug/imxregs/
+IMXREGS_SOURCE:=$(TOPDIR)/../target/linux/debug/imxregs/
IMXREGS_DIR:=$(BUILD_DIR)/imxregs-$(IMXREGS_VER)
IMXREGS_CAT:=zcat
ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
@@ -26,7 +26,7 @@ $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY): $(IMXREGS_DIR)/$(IMXREGS_BINARY)
install -D $< $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
-imxregs: uclibc $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
+imxregs: $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
imxregs-clean:
rm -f $(TARGET_DIR)/$(IMXREGS_TARGET_BINARY)
diff --git a/buildroot/package/armadeus/imxssi/imxssi.mk b/buildroot/package/armadeus/imxssi/imxssi.mk
index bedd3b0..f5fad24 100644
--- a/buildroot/package/armadeus/imxssi/imxssi.mk
+++ b/buildroot/package/armadeus/imxssi/imxssi.mk
@@ -5,7 +5,7 @@
#############################################################
IMXSSI_VER:=1.0
-IMXSSI_SOURCE:=$(BUILD_DIR)/../../target/linux/debug/imxssi/
+IMXSSI_SOURCE:=$(TOPDIR)/../target/linux/debug/imxssi/
IMXSSI_DIR:=$(BUILD_DIR)/imxssi-$(IMXSSI_VER)
IMXSSI_CAT:=zcat
IMXSSI_BINARY:=imxssi
diff --git a/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk b/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
index a863df2..2ac0695 100644
--- a/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
+++ b/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
@@ -5,7 +5,7 @@
#############################################################
MAX5821CTRL_VER:=1.0
-MAX5821CTRL_SOURCE:=$(BUILD_DIR)/../../target/packages/max5821ctrl
+MAX5821CTRL_SOURCE:=$(TOPDIR)/../target/packages/max5821ctrl
MAX5821CTRL_DIR:=$(BUILD_DIR)/max5821ctrl-$(MAX5821CTRL_VER)
MAX5821CTRL_CAT:=zcat
MAX5821CTRL_BINARY:=setDAC
@@ -23,7 +23,7 @@ $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY): $(MAX5821CTRL_DIR)/$(MAX5821CTRL_BIN
install -D $< $@
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
-max5821ctrl: uclibc $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
+max5821ctrl: $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
max5821ctrl-clean:
rm -f $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
diff --git a/buildroot/package/armadeus/testsuite/testsuite.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
index 4f2c3d1..8c0e71a 100644
--- a/buildroot/package/armadeus/testsuite/testsuite.mk
+++ b/buildroot/package/armadeus/testsuite/testsuite.mk
@@ -5,13 +5,13 @@
#############################################################
ARMADEUS-TESTSUITE_VER:=1.0
-ARMADEUS-TESTSUITE_SOURCE:=$(BUILD_DIR)/../../target/test/
+ARMADEUS-TESTSUITE_SOURCE:=$(TOPDIR)/../target/test/
ARMADEUS-TESTSUITE_DIR:=$(BUILD_DIR)/armadeus-testsuite-$(ARMADEUS-TESTSUITE_VER)
ARMADEUS-TESTSUITE_CAT:=zcat
ARMADEUS-TESTSUITE_BINARY:=test_env.sh
ARMADEUS-TESTSUITE_TARGET_DIR:=$(TARGET_DIR)/usr/bin/testsuite
ARMADEUS-TESTSUITE_TARGET_BINARY:=$(ARMADEUS-TESTSUITE_TARGET_DIR)/$(ARMADEUS-TESTSUITE_BINARY)
-ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR:=$(BUILD_DIR)/../../target/linux/modules/fpga/wishbone_example/wb_button/
+ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR:=$(TOPDIR)/../target/linux/modules/fpga/wishbone_example/wb_button/
$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk
index eed98ea..dc520f5 100644
--- a/buildroot/package/fbgrab/fbgrab.mk
+++ b/buildroot/package/fbgrab/fbgrab.mk
@@ -28,7 +28,7 @@ $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
touch -c $@
-fbgrab: uclibc libpng $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
+fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
fbgrab-clean:
rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
diff --git a/buildroot/package/mplayer/.gitignore b/buildroot/package/mplayer/.gitignore
deleted file mode 100644
index 422d0d5..0000000
--- a/buildroot/package/mplayer/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Config.in
-/mplayer-1.0rc1-atmel.3.patch
-/mplayer-1.0rc1-index.patch
-/mplayer.mk
diff --git a/buildroot/local/apf9328_test/uclibc-0.9.29.config b/buildroot/target/device/armadeus/apf27/uClibc-0.9.30.config.arm
similarity index 80%
copy from buildroot/local/apf9328_test/uclibc-0.9.29.config
copy to buildroot/target/device/armadeus/apf27/uClibc-0.9.30.config.arm
index 9a613de..0ef197a 100644
--- a/buildroot/local/apf9328_test/uclibc-0.9.29.config
+++ b/buildroot/target/device/armadeus/apf27/uClibc-0.9.30.config.arm
@@ -1,9 +1,11 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 17:35:00 2009
+# Version: 0.9.30.2
+# Mon Feb 1 14:24:52 2010
#
# 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
@@ -25,6 +27,7 @@ TARGET_arm=y
# TARGET_v850 is not set
# TARGET_vax is not set
# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
#
# Target Architecture Features and Options
@@ -39,13 +42,15 @@ CONFIG_ARM_EABI=y
# CONFIG_ARM710 is not set
# CONFIG_ARM7TDMI is not set
# CONFIG_ARM720T is not set
-CONFIG_ARM920T=y
+# CONFIG_ARM920T is not set
# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
+CONFIG_ARM926T=y
# CONFIG_ARM10T is not set
# CONFIG_ARM1136JF_S is not set
# CONFIG_ARM1176JZ_S is not set
# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_CORTEX_M3 is not set
+# CONFIG_ARM_CORTEX_M1 is not set
# CONFIG_ARM_SA110 is not set
# CONFIG_ARM_SA1100 is not set
# CONFIG_ARM_XSCALE is not set
@@ -65,7 +70,8 @@ UCLIBC_HAS_FLOATS=y
# UCLIBC_HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
-KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/toolchain_build_armv4t/linux/include"
+# UCLIBC_HAS_FENV is not set
+KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus-git-new-buildroot/buildroot/output/toolchain/linux/include"
HAVE_DOT_CONFIG=y
#
@@ -73,7 +79,7 @@ HAVE_DOT_CONFIG=y
#
# HAVE_NO_PIC is not set
DOPIC=y
-# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_SHARED is not set
# ARCH_HAS_NO_LDSO is not set
HAVE_SHARED=y
# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
@@ -84,10 +90,12 @@ LDSO_BASE_FILENAME="ld.so"
# UCLIBC_STATIC_LDCONFIG is not set
# LDSO_RUNPATH is not set
UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
# PTHREADS_DEBUG_SUPPORT is not set
LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
# MALLOC_SIMPLE is not set
@@ -97,11 +105,13 @@ UCLIBC_DYNAMIC_ATEXIT=y
# COMPAT_ATEXIT is not set
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-# UNIX98PTY_ONLY is not set
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS_PTY=y
ASSUME_DEVPTS=y
+# UNIX98PTY_ONLY is not set
+UCLIBC_HAS_GETPT=y
UCLIBC_HAS_TM_EXTENSIONS=y
UCLIBC_HAS_TZ_CACHING=y
UCLIBC_HAS_TZ_FILE=y
@@ -115,8 +125,27 @@ UCLIBC_PWD_BUFFER_SIZE=256
UCLIBC_GRP_BUFFER_SIZE=256
#
-# Networking Support
-#
+# Support various families of functions
+#
+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_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
@@ -198,7 +227,7 @@ UCLIBC_BUILD_NOW=y
#
# uClibc development/debugging options
#
-CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/build_armv4t/staging_dir/usr/bin/arm-linux-uclibc-"
+CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus-git-new-buildroot/buildroot/output/build/staging_dir/usr/bin/arm-linux-uclibcgnueabi-"
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
# DODEBUG_PT is not set
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
index e9726c9..1878545 100644
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
@@ -5,6 +5,9 @@ make the application segfault in case of error (== bad struct tms parameter).
Signed-off-by: Julien Boibessot <jul...@ar...>
+Reported to uClibc. Integrated in a different way in uClibc > 0.9.30.2 with this
+commit: http://git.uclibc.org/uClibc/commit/?id=779c35b7c4e47d9fc8f69ee582e822a2f6f45411
+
Index: uClibc-0.9.29/libc/sysdeps/linux/common/times.c
===================================================================
--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/times.c 2010-01-27 10:15:38.000000000 +0100
diff --git a/patches/buildroot/030-gcc.patch b/patches/buildroot/030-gcc.patch
index c03c8dc..5a2cbd3 100644
--- a/patches/buildroot/030-gcc.patch
+++ b/patches/buildroot/030-gcc.patch
@@ -1,3 +1,5 @@
+Can be removed when updating to 2010.02 Buildroot.
+
--- buildroot/target/Config.in.arch.ref 2008-11-03 09:15:12.000000000 +0100
+++ buildroot/target/Config.in.arch 2008-11-23 23:08:56.000000000 +0100
@@ -59,20 +59,30 @@ choice
diff --git a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
index 6c79a48..c8e6ae5 100644
--- a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
+++ b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
@@ -1,6 +1,6 @@
"Calculate" BR2_LINUX26_VERSION when BR2_KERNEL_ADD_LATEST_MINORPATCH is used.
-Sent to Buildroot guys. Not integrated.
+Sent to Buildroot guys. Integrated in another way.
Signed-off-by: Julien Boibessot <jul...@ar...>
diff --git a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
index 8a7a737..2c49f74 100644
--- a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
+++ b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
@@ -1,6 +1,8 @@
-Download Kernel.org minor patches at the same time as full sources.
+"linux26-source" target only downloads bare kernel sources.
+This patch makes the (eventually needed) kernel.org minor patches are
+also downloaded.
-Sent to Buildroot guys. Not integrated.
+Sent to Buildroot guys. Integrated, then removed. Not clean ?
Signed-off-by: Julien Boibessot <jul...@ar...>
diff --git a/patches/buildroot/001-add_armadeus_device.patch b/patches/buildroot/2010.02/001-add_armadeus_device.patch
similarity index 81%
copy from patches/buildroot/001-add_armadeus_device.patch
copy to patches/buildroot/2010.02/001-add_armadeus_device.patch
index 793cfab..0fbb710 100644
--- a/patches/buildroot/001-add_armadeus_device.patch
+++ b/patches/buildroot/2010.02/001-add_armadeus_device.patch
@@ -1,10 +1,10 @@
--- buildroot/target/device/Config.in.ref 2008-11-03 15:31:26.000000000 +0100
+++ buildroot/target/device/Config.in 2008-11-03 15:32:00.000000000 +0100
@@ -5,6 +5,7 @@ source "project/Config.in"
+
comment "Preset Devices"
- source "target/device/AMD/Config.in"
+source "target/device/armadeus/Config.in"
source "target/device/ARMLTD/Config.in"
source "target/device/Atmel/Config.in"
- source "target/device/Hitachi/Config.in"
+ source "target/device/KwikByte/Config.in"
diff --git a/patches/buildroot/006-lcd4linux.patch b/patches/buildroot/2010.02/006-lcd4linux.patch
similarity index 100%
copy from patches/buildroot/006-lcd4linux.patch
copy to patches/buildroot/2010.02/006-lcd4linux.patch
diff --git a/patches/buildroot/017-lmbench.patch b/patches/buildroot/2010.02/017-lmbench.patch
similarity index 92%
copy from patches/buildroot/017-lmbench.patch
copy to patches/buildroot/2010.02/017-lmbench.patch
index 5cb81fc..6bda2d3 100644
--- a/patches/buildroot/017-lmbench.patch
+++ b/patches/buildroot/2010.02/017-lmbench.patch
@@ -1,8 +1,8 @@
--- buildroot/package/Con...
[truncated message content] |
|
From: Nicolas <th...@us...> - 2010-02-03 15:03:32
|
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 25c21a07330c257b8ca1c5833c2848c54cba80aa (commit)
from dddc2e0376fa32e009063c6e432ae91b38ed53e7 (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 25c21a07330c257b8ca1c5833c2848c54cba80aa
Author: nicolas colombain <nic...@ar...>
Date: Wed Feb 3 16:03:05 2010 +0100
[LINUX] add comment to timekeeping patch
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/352-armadeus-timekeeping.patch | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
index 351c045..a05985e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
@@ -1,3 +1,9 @@
+Fix timekeeping resume: http://patchwork.kernel.org/patch/50306/
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29/kernel/time/timekeeping.c
+===================================================================
--- a/kernel/time/timekeeping.c 2009-03-24 00:12:14.000000000 +0100
+++ b/kernel/time/timekeeping.c 2010-02-03 13:25:00.000000000 +0100
@@ -322,7 +322,8 @@ static int timekeeping_resume(struct sys
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-02-03 14:10: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 dddc2e0376fa32e009063c6e432ae91b38ed53e7 (commit)
from 31ff120f1c0d39e3e8b8860b1569de283f11b4c5 (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 dddc2e0376fa32e009063c6e432ae91b38ed53e7
Author: nicolas colombain <nic...@ar...>
Date: Wed Feb 3 15:09:27 2010 +0100
[LINUX] max1027 code cleanup
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/max1027/max1027.c | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/target/linux/modules/max1027/max1027.c b/target/linux/modules/max1027/max1027.c
index 29bf921..25b2b4d 100644
--- a/target/linux/modules/max1027/max1027.c
+++ b/target/linux/modules/max1027/max1027.c
@@ -131,6 +131,14 @@ struct spi_transfer transfer[MAX_NB_RESULTS];
struct spi_message message;
u8 buffer[MAX_NB_RESULTS*2]; /* each result is sent with 16 bits */
+
+static inline void trig_cnvst(struct max1027* max1027)
+{
+ gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
+ udelay(1);
+ gpio_set_value(max1027->cnvst, 1);
+}
+
static void max1027_start_conv(struct max1027*, struct adc_channel*);
static void fifo_flush(struct adc_channel* channel)
@@ -224,9 +232,7 @@ static void max1027_start_conv(struct max1027 *max1027, struct adc_channel *chan
if (channel)
clear_bit(DATA_AVAILABLE, &channel->status);
/* Use CNVST triggered conv. */
- gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
- udelay(1);
- gpio_set_value(max1027->cnvst, 1);
+ trig_cnvst(max1027);
}
/* Called when SPI got results from MAX1027 */
@@ -520,11 +526,13 @@ static ssize_t max1027_set_conversion(struct device *dev,
/* Send value to chip */
max1027_send_cmd(spi, MAX1027_REG_CONV | val);
if (!(max1027->setup_reg & MAX1027_REG_SETUP_CKSEL1)) {
+ if (max1027->cnvst == 0){
+ printk(KERN_WARNING DRIVER_NAME "CNVST pin not defined!\n");
+ return 0;
+ }
mdelay(1);
/* Use CNVST triggered conv. */
- gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
- udelay(1);
- gpio_set_value(max1027->cnvst, 1);
+ trig_cnvst(max1027);
}
/* Wait until current convertion is finished if corresponding clock
@@ -805,7 +813,7 @@ static int __devinit max1027_probe(struct spi_device *spi)
goto err_irq;
}
max1027->cnvst = platform_info->cnvst_pin;
- if (max1027->cnvst >= 0)
+ if (max1027->cnvst > 0)
gpio_set_value(max1027->cnvst, 1);
/* Create /sys entries */
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-02-03 13:26: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 31ff120f1c0d39e3e8b8860b1569de283f11b4c5 (commit)
from 745321073e4a650d23720349367cd58321ea5e95 (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 31ff120f1c0d39e3e8b8860b1569de283f11b4c5
Author: nicolas colombain <nic...@ar...>
Date: Wed Feb 3 14:25:20 2010 +0100
[LINUX] fix suspend/resume of hrtimer. Must be corrected in 2.6.32
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/352-armadeus-timekeeping.patch | 30 ++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
new file mode 100644
index 0000000..351c045
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
@@ -0,0 +1,30 @@
+--- a/kernel/time/timekeeping.c 2009-03-24 00:12:14.000000000 +0100
++++ b/kernel/time/timekeeping.c 2010-02-03 13:25:00.000000000 +0100
+@@ -322,7 +322,8 @@ static int timekeeping_resume(struct sys
+
+ clocksource_resume();
+
+- write_seqlock_irqsave(&xtime_lock, flags);
++ local_irq_save(flags);
++ write_seqlock(&xtime_lock);
+
+ if (now && (now > timekeeping_suspend_time)) {
+ unsigned long sleep_length = now - timekeeping_suspend_time;
+@@ -337,7 +338,8 @@ static int timekeeping_resume(struct sys
+ clock->cycle_last = clocksource_read(clock);
+ clock->error = 0;
+ timekeeping_suspended = 0;
+- write_sequnlock_irqrestore(&xtime_lock, flags);
++ write_sequnlock(&xtime_lock);
++
+
+ touch_softlockup_watchdog();
+
+@@ -345,6 +347,7 @@ static int timekeeping_resume(struct sys
+
+ /* Resume hrtimers */
+ hres_timers_resume();
++ local_irq_restore(flags);
+
+ return 0;
+ }
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-02 21:54:24
|
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 745321073e4a650d23720349367cd58321ea5e95 (commit)
from 5ee7b5a4369a7117289b5176ae62e11db65d7d0e (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 745321073e4a650d23720349367cd58321ea5e95
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 22:53:09 2010 +0100
[BUILDROOT] Removes buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch from GIT and replace it by a patch in buildroot/patches/
-----------------------------------------------------------------------
Summary of changes:
.../package/mplayer/mplayer-1.0rc1-armv4.patch | 14 ------------
...for_pld_asm_instruction_on_non_armv5_arch.patch | 23 ++++++++++++++++++++
2 files changed, 23 insertions(+), 14 deletions(-)
delete mode 100644 buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
create mode 100644 patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
diff --git a/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch b/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
deleted file mode 100644
index f2af282..0000000
--- a/buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S.ori 2006-10-23 00:32:33.000000000 +0200
-+++ MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S 2009-01-08 00:26:45.000000000 +0100
-@@ -19,6 +19,11 @@
- @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- @
-
-+#if !defined(HAVE_ARMV5TE) && !defined(HAVE_IWMMXT)
-+.macro pld arg
-+ @
-+.endm
-+#endif
- .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
- mov \Rd0, \Rn0, lsr #(\shift * 8)
- mov \Rd1, \Rn1, lsr #(\shift * 8)
diff --git a/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch b/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
new file mode 100644
index 0000000..d9092b9
--- /dev/null
+++ b/patches/buildroot/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
@@ -0,0 +1,23 @@
+This patch is needed to have mplayer compile on ARMv4 arch (maybe others...)
+
+Index: buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/mplayer/mplayer-1.0rc1-add_pld_asm_inst_for_non_armv5_arch.patch 2010-02-02 21:39:09.000000000 +0100
+@@ -0,0 +1,16 @@
++pld instruction is only available on ARMv5.
++
++--- MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S.ori 2006-10-23 00:32:33.000000000 +0200
+++++ MPlayer-1.0rc1/libavcodec/armv4l/dsputil_arm_s.S 2009-01-08 00:26:45.000000000 +0100
++@@ -19,6 +19,11 @@
++ @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ @
++
+++#if !defined(HAVE_ARMV5TE) && !defined(HAVE_IWMMXT)
+++.macro pld arg
+++ @
+++.endm
+++#endif
++ .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
++ mov \Rd0, \Rn0, lsr #(\shift * 8)
++ mov \Rd1, \Rn1, lsr #(\shift * 8)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-02 15:54:19
|
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 5ee7b5a4369a7117289b5176ae62e11db65d7d0e (commit)
via bd3fec43a62bcc981a161811817fa1a929326287 (commit)
via e27b52cb0aede89b4108b8dd58ad3806c4b2b529 (commit)
from 17c697b529a3a12eeff044043f277f4df210a070 (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 5ee7b5a4369a7117289b5176ae62e11db65d7d0e
Merge: bd3fec43a62bcc981a161811817fa1a929326287 17c697b529a3a12eeff044043f277f4df210a070
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 16:53:43 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit bd3fec43a62bcc981a161811817fa1a929326287
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 16:41:30 2010 +0100
[BUILDROOT] Makes TOPDIR an absolute path
commit e27b52cb0aede89b4108b8dd58ad3806c4b2b529
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 2 16:31:47 2010 +0100
[BUILDROOT] Pygame's tslib patch doesn't work properly on *Ubuntu 9.10. Mark it as 'to fix'
-----------------------------------------------------------------------
Summary of changes:
...lib-1.0-zzz-prevents_unresolved_symbols.to_fix} | 0
.../098-makes_TOPDIR_is_an_absolute_path.patch | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
rename buildroot/package/tslib/{tslib-1.0-zzz-prevents_unresolved_symbols.patch => tslib-1.0-zzz-prevents_unresolved_symbols.to_fix} (100%)
create mode 100644 patches/buildroot/098-makes_TOPDIR_is_an_absolute_path.patch
diff --git a/buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.patch b/buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix
similarity index 100%
rename from buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.patch
rename to buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix
diff --git a/patches/buildroot/098-makes_TOPDIR_is_an_absolute_path.patch b/patches/buildroot/098-makes_TOPDIR_is_an_absolute_path.patch
new file mode 100644
index 0000000..9764419
--- /dev/null
+++ b/patches/buildroot/098-makes_TOPDIR_is_an_absolute_path.patch
@@ -0,0 +1,16 @@
+Already done in latest Buildroot version.
+
+Index: buildroot/Makefile
+===================================================================
+--- buildroot.orig/Makefile 2010-02-02 16:23:20.000000000 +0100
++++ buildroot/Makefile 2010-02-02 16:26:34.000000000 +0100
+@@ -21,7 +21,8 @@
+ # Just run 'make menuconfig', configure stuff, then run 'make'.
+ # You shouldn't need to mess with anything beyond this point...
+ #--------------------------------------------------------------
+-TOPDIR=./
++# absolute path
++TOPDIR:=$(shell pwd)
+ CONFIG_CONFIG_IN=Config.in
+ CONFIG_DEFCONFIG=.defconfig
+ CONFIG=package/config
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-02-02 13:55:08
|
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 17c697b529a3a12eeff044043f277f4df210a070 (commit)
from 12e9b0f863ec8dd53d1faebc53fa2a222889c3ac (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 17c697b529a3a12eeff044043f277f4df210a070
Author: nicolas colombain <nic...@ar...>
Date: Tue Feb 2 14:54:24 2010 +0100
[LINUX] max1027: allow CNVST pin to be used in low speed mode
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/max1027/max1027.c | 39 ++++++++++++++------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/target/linux/modules/max1027/max1027.c b/target/linux/modules/max1027/max1027.c
index 387fb61..29bf921 100644
--- a/target/linux/modules/max1027/max1027.c
+++ b/target/linux/modules/max1027/max1027.c
@@ -49,7 +49,7 @@
#define DRIVER_NAME "max1027"
-#define DRIVER_VERSION "0.6"
+#define DRIVER_VERSION "0.7"
/* Internal registers prefixes */
@@ -182,9 +182,7 @@ static void inline max1027_wait_end_of_conv(struct max1027 *max1027)
delay = wait_event_timeout(max1027->conv_wq, max1027->status==0, msecs_to_jiffies(20));
if (delay == 0) {
-#ifdef DEBUG
- printk("T%lu ", max1027->status);
-#endif
+ printk(KERN_WARNING "error: missed conversion %lu ", max1027->status);
if (test_bit(CONVERSION_RUNNING, &max1027->status)) {
max1027->missed_eoc++;
clear_bit(CONVERSION_RUNNING, &max1027->status);
@@ -225,16 +223,10 @@ static void max1027_start_conv(struct max1027 *max1027, struct adc_channel *chan
if (channel)
clear_bit(DATA_AVAILABLE, &channel->status);
- /* Conversion start depends on CNVST pin presence and clock mode */
- if ((max1027->cnvst < 0) || (max1027->setup_reg & MAX1027_REG_SETUP_CKSEL1)) {
- /* Use SPI triggered conv. */
- max1027_send_cmd(current_spi, max1027->conv_reg);
- } else {
- /* Use CNVST triggered conv. */
- gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
- udelay(1);
- gpio_set_value(max1027->cnvst, 1);
- }
+ /* Use CNVST triggered conv. */
+ gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
+ udelay(1);
+ gpio_set_value(max1027->cnvst, 1);
}
/* Called when SPI got results from MAX1027 */
@@ -521,20 +513,23 @@ static ssize_t max1027_set_conversion(struct device *dev,
max1027_flush_all_channels(max1027);
/* Warn if a conversion is already launched and selected mode will
trigger a new one */
- if ((max1027->setup_reg & MAX1027_REG_SETUP_CKSEL1)) {
- if (test_and_set_bit(CONVERSION_RUNNING, &max1027->status)) {
- /* Should not occur !! */
- printk("%s: conv already running!\n", __func__);
- }
+ if (test_and_set_bit(CONVERSION_RUNNING, &max1027->status)) {
+ /* Should not occur !! */
+ printk("%s: conv already running!\n", __func__);
}
/* Send value to chip */
max1027_send_cmd(spi, MAX1027_REG_CONV | val);
+ if (!(max1027->setup_reg & MAX1027_REG_SETUP_CKSEL1)) {
+ mdelay(1);
+ /* Use CNVST triggered conv. */
+ gpio_set_value(max1027->cnvst, 0); /* Platform specific no ? */
+ udelay(1);
+ gpio_set_value(max1027->cnvst, 1);
+ }
/* Wait until current convertion is finished if corresponding clock
mode is selected */
- if ((max1027->setup_reg & MAX1027_REG_SETUP_CKSEL1)) {
- max1027_wait_end_of_conv(max1027);
- }
+ max1027_wait_end_of_conv(max1027);
pr_debug("%s end\n", __FUNCTION__);
mutex_unlock(&max1027->update_lock);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-02-01 21:38:24
|
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 12e9b0f863ec8dd53d1faebc53fa2a222889c3ac (commit)
via 17de2993729478a593bf48da6a3429cee841b188 (commit)
via 67de91dc3c66831001fa4f511e9fea63ee8b5d34 (commit)
from f93c5d282936c41b6abe64f606aa97c25645ffc4 (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 12e9b0f863ec8dd53d1faebc53fa2a222889c3ac
Merge: 17de2993729478a593bf48da6a3429cee841b188 f93c5d282936c41b6abe64f606aa97c25645ffc4
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 1 22:37:51 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 17de2993729478a593bf48da6a3429cee841b188
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 1 22:37:31 2010 +0100
[BUILDROOT] [UCLIBC] Correct the times() system call: some return values are returned as errors but shouldn't
commit 67de91dc3c66831001fa4f511e9fea63ee8b5d34
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jan 31 18:39:33 2010 +0100
[BUILDROOT] Updates APF27 default config
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/apf27/apf27_defconfig | 13 +++--
...s_syscall_return_value_as_standard_errors.patch | 52 ++++++++++++++++++++
2 files changed, 59 insertions(+), 6 deletions(-)
create mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index e14fc10..a7a1ece 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jan 14 09:44:51 2010
+# Sun Jan 31 18:25:35 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -339,9 +339,14 @@ BR2_PACKAGE_PKGCONFIG=y
#
# Armadeus specific tools/utilities
#
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_PACKAGE_DUMMY is not set
# BR2_PACKAGE_FBTEST is not set
@@ -482,8 +487,6 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_BLOCKDEV_SUPPORT=y
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_CH7024CTRL is not set
#
# dbus not available (need expat or libxml2)
@@ -495,7 +498,6 @@ BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
-BR2_PACKAGE_FPGAREGS=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
@@ -503,7 +505,6 @@ BR2_PACKAGE_FPGAREGS=y
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
-BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
@@ -511,7 +512,6 @@ BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_LIBUSB is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
-BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
@@ -600,6 +600,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_FLITE is not set
BR2_GRAPHIC_SUPPORT=y
#
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
new file mode 100644
index 0000000..e9726c9
--- /dev/null
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-001-sysdeps-common-do_not_handle_times_syscall_return_value_as_standard_errors.patch
@@ -0,0 +1,52 @@
+Implements "times" syscall like on glibc: only EFAULT is considered as a valid
+error code from Linux kernel.
+To handle architectures that can't distinguish the error from a return value,
+make the application segfault in case of error (== bad struct tms parameter).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/times.c
+===================================================================
+--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/times.c 2010-01-27 10:15:38.000000000 +0100
++++ uClibc-0.9.29/libc/sysdeps/linux/common/times.c 2010-01-27 10:49:37.000000000 +0100
+@@ -12,5 +12,39 @@
+
+ libc_hidden_proto(times)
+
+-_syscall1(clock_t, times, struct tms *, buf);
++clock_t times(struct tms *buf)
++{
++ INTERNAL_SYSCALL_DECL (err);
++ clock_t ret = INTERNAL_SYSCALL (times, err, 1, buf);
++ if (INTERNAL_SYSCALL_ERROR_P (ret, err)
++ && __builtin_expect (INTERNAL_SYSCALL_ERRNO (ret, err) == EFAULT, 0))
++ {
++ /* This might be an error or not. For architectures which have
++ no separate return value and error indicators we cannot
++ distinguish a return value of -1 from an error. Do it the
++ hard way. We crash applications which pass in an invalid BUF
++ pointer. */
++#define touch(v) \
++ do { \
++ clock_t temp = v; \
++ asm volatile ("" : "+r" (temp)); \
++ v = temp; \
++ } while (0)
++ touch (buf->tms_utime);
++ touch (buf->tms_stime);
++ touch (buf->tms_cutime);
++ touch (buf->tms_cstime);
++
++ /* If we come here the tms struct is valid and the kernel did not
++ return an EFAULT error. Return the value given by the kernel. */
++ }
++
++ /* Return value (clock_t) -1 signals an error to userspace, but if there
++ wasn't any, return 0 instead. */
++ if (ret == (clock_t) -1)
++ return (clock_t) 0;
++
++ return ret;
++}
++
+ libc_hidden_def(times)
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-02-01 13:53:45
|
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 f93c5d282936c41b6abe64f606aa97c25645ffc4 (commit)
via ed277627077e5c11109832083256f87ed53d695d (commit)
from 8f51ea04e31cc5c496e26cab4895b7db04d31e67 (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 f93c5d282936c41b6abe64f606aa97c25645ffc4
Merge: ed277627077e5c11109832083256f87ed53d695d 8f51ea04e31cc5c496e26cab4895b7db04d31e67
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 1 14:52:51 2010 +0100
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit ed277627077e5c11109832083256f87ed53d695d
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 1 14:51:45 2010 +0100
[LINUX][MODULE] suppress debug message
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/max1027/max1027.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/target/linux/modules/max1027/max1027.c b/target/linux/modules/max1027/max1027.c
index 28d2290..387fb61 100644
--- a/target/linux/modules/max1027/max1027.c
+++ b/target/linux/modules/max1027/max1027.c
@@ -182,7 +182,9 @@ static void inline max1027_wait_end_of_conv(struct max1027 *max1027)
delay = wait_event_timeout(max1027->conv_wq, max1027->status==0, msecs_to_jiffies(20));
if (delay == 0) {
+#ifdef DEBUG
printk("T%lu ", max1027->status);
+#endif
if (test_bit(CONVERSION_RUNNING, &max1027->status)) {
max1027->missed_eoc++;
clear_bit(CONVERSION_RUNNING, &max1027->status);
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-01-29 22:50: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 8f51ea04e31cc5c496e26cab4895b7db04d31e67 (commit)
from aa31b0afbb79fac81765edfe67e705a2106684c7 (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 8f51ea04e31cc5c496e26cab4895b7db04d31e67
Author: nicolas colombain <nic...@ar...>
Date: Fri Jan 29 23:49:33 2010 +0100
[LINUX] add suspend/resume for APF27 USB PHY
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 0bf74ac..782a065 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -10,7 +10,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-01-21 11:06:41.000000000 +0100
-@@ -0,0 +1,712 @@
+@@ -0,0 +1,727 @@
+ /*
+ * apf27.c
+ *
@@ -306,6 +306,18 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+ ulpi_clear(SUSPENDM, ISP1504_FCNCTL, view);
+}
+
++static void isp1504_resume(void __iomem *view)
++{
++ /* uggly but the STP line must be set to 1 before the first PHY access
++ in order to wake up the ULPI clock of the PHY. */
++ gpio_set_value(GPIO_PORTE | 1, 1);
++ /* deassert STP (gpio mode) */
++ mxc_gpio_mode(GPIO_PORTE | 1 | GPIO_OUT | GPIO_GPIO);
++ mdelay(1);
++ /* STP now managed by the USB host ctrl */
++ mxc_gpio_mode(PE1_PF_USBOTG_STP);
++}
++
+static int apf27_usbotg_init(struct platform_device *pdev)
+{
+ int ret;
@@ -590,6 +602,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+{
+ printk("___ %s\n", __func__);
+
++#ifdef CONFIG_USB_EHCI_MXC
++ isp1504_resume((void __iomem *)(IO_ADDRESS(OTG_BASE_ADDR + 0x170)));
++#endif
+ apf27_baseboard_resume();
+
+ return 0;
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-01-27 18:00:48
|
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 aa31b0afbb79fac81765edfe67e705a2106684c7 (commit)
from 52447f8b6226cf3feb4ac2bc97d414718aff5437 (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 aa31b0afbb79fac81765edfe67e705a2106684c7
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 27 19:00:23 2010 +0100
[LINUX] add backlight power switch capability in fb driver
-----------------------------------------------------------------------
Summary of changes:
...xfb-add_backlight_power_switch_capability.patch | 35 ++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
new file mode 100644
index 0000000..788d321
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
@@ -0,0 +1,35 @@
+Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/imx_fb.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/imx_fb.h 2010-01-27 18:50:48.000000000 +0100
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/imx_fb.h 2010-01-27 18:51:43.000000000 +0100
+@@ -28,6 +28,7 @@
+ int (*init)(struct platform_device *pdev);
+ int (*exit)(struct platform_device *pdev);
+
++ void (*power_backlight)(struct platform_device *pdev, int on);
+ int (*power_lcd)(struct platform_device *pdev, int on);
+ };
+
+Index: linux-2.6.29.6/drivers/video/mxc/mx2fb.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/video/mxc/mx2fb.c 2010-01-27 18:54:43.000000000 +0100
++++ linux-2.6.29.6/drivers/video/mxc/mx2fb.c 2010-01-27 18:56:36.000000000 +0100
+@@ -772,6 +772,9 @@
+ mx2fbi->pdata->init(mx2fbi->pdev);
+ if (mx2fbi->pdata->power_lcd)
+ mx2fbi->pdata->power_lcd(mx2fbi->pdev, 1);
++ if (mx2fbi->pdata->power_backlight)
++ mx2fbi->pdata->power_backlight(mx2fbi->pdev, 1);
++
+ _set_brightness(brightness);
+ fb_enabled++;
+ #ifdef CONFIG_FB_MXC_TVOUT
+@@ -800,6 +803,8 @@
+ else {
+ if (fb_enabled) {
+ mx2fbi->pdata->exit(mx2fbi->pdev);
++ if (mx2fbi->pdata->power_backlight)
++ mx2fbi->pdata->power_backlight(mx2fbi->pdev, 0);
+ if (mx2fbi->pdata->power_lcd)
+ mx2fbi->pdata->power_lcd(mx2fbi->pdev, 0);
+ _set_brightness(0);
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-01-27 17:38:32
|
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 52447f8b6226cf3feb4ac2bc97d414718aff5437 (commit)
via 3e2d7d6bf57dcc3d76807405595332c1e271b0e1 (commit)
from 1484678ad850fcafcd51f6503401fb2b92fe4eb2 (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 52447f8b6226cf3feb4ac2bc97d414718aff5437
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 27 17:48:41 2010 +0100
[LINUX] suppress power_on function callback in hx5116.h
commit 3e2d7d6bf57dcc3d76807405595332c1e271b0e1
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jan 27 17:22:34 2010 +0100
[LINUX] Suppressing backlight powering capability from hx5116_display driver (this capability must be in imx_fb driver)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/343-apf27-amoled-hx5116.patch | 5 ++---
target/linux/modules/display/hx5116_display.c | 6 ------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
index 47ddaae..144e6f2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/343-apf27-amoled-hx5116.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.29.6/include/video/hx5116.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/video/hx5116.h 2010-01-14 14:19:29.000000000 +0100
-@@ -0,0 +1,113 @@
++++ linux-2.6.29.6/include/video/hx5116.h 2010-01-27 17:47:15.000000000 +0100
+@@ -0,0 +1,112 @@
+/*
+ *
+ * HX5116 160CH Single Chip Driver for LPTS AMOLED
@@ -110,7 +110,6 @@ Index: linux-2.6.29.6/include/video/hx5116.h
+struct hx5116_display {
+ struct display_device *display_dev;
+ struct spi_device *spi; /* spi bus */
-+ void (*power_on)(int); /* function that power on screen */
+ void (*reset_on)(int); /* function that let hx5116 on reset */
+ int gcontrast_value; /* current contrast value */
+};
diff --git a/target/linux/modules/display/hx5116_display.c b/target/linux/modules/display/hx5116_display.c
index 902b247..fd63d4c 100644
--- a/target/linux/modules/display/hx5116_display.c
+++ b/target/linux/modules/display/hx5116_display.c
@@ -88,13 +88,11 @@ static int hx5116_display_remove(struct display_device *dev)
static void hx5116_display_suspend(struct display_device *dev, pm_message_t state)
{
struct hx5116_display *hx5116_dev = dev->priv_data;
- hx5116_dev->power_on(0); /* switch off AMOLED power */
}
static void hx5116_display_resume(struct display_device *dev)
{
struct hx5116_display *hx5116_dev = dev->priv_data;
- hx5116_dev->power_on(1); /* switch on AMOLED power */
}
#else
#define hx5116_display_suspend NULL
@@ -156,9 +154,6 @@ static void hx5116_init_sequence(struct hx5116_display *hx5116_dev)
hx5116_write (hx5116_dev, 0x2A, 0x07); /*set B_255*/
hx5116_write (hx5116_dev, 0x06, 0x03); /*set display on*/
- msleep(31); /* Wait for 15 Vsync to power on screen */
-
- hx5116_dev->power_on(1); /* switch on AMOLED power */
}
@@ -204,7 +199,6 @@ static int hx5116_spi_remove(struct spi_device *pdev)
{
struct hx5116_display *hx5116_dev = pdev->dev.platform_data;
- hx5116_dev->power_on(0); /* switch off AMOLED power */
hx5116_dev->reset_on(1); /* let hx5116 in reset */
display_device_unregister(hx5116_dev->display_dev);
return 0;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-01-26 21:48:17
|
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 1484678ad850fcafcd51f6503401fb2b92fe4eb2 (commit)
via 14dba0bec68b42fa96ed74bcc1cf4c3d386dd2f5 (commit)
from f3addf0634096076dc613602bb0baff83a2fab79 (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 1484678ad850fcafcd51f6503401fb2b92fe4eb2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 26 22:47:49 2010 +0100
[LINUX] Fixes APW Bluetooth module init and UART5 GPIOs freeing. Thanks to Nicolas S.
commit 14dba0bec68b42fa96ed74bcc1cf4c3d386dd2f5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 26 22:33:09 2010 +0100
[BUILDROOT] Patches cleanup
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 27 +++++++++++---------
...eroot.patch => 038-fakeroot-bump_version.patch} | 0
.../046-prboom-install_it_only_once.patch | 2 +
...e_kernel_version_with_latest_minor_number.patch | 2 +-
...ownload_minor_patches_from_kernel_org_too.patch | 2 +-
...s_building_when_modules_compilation_fails.patch | 2 +-
patches/buildroot/051-u-boot.patch | 2 +
patches/buildroot/053-libusb.patch | 2 +
.../054-ntp-allow_ntpd_selection_or_not.patch | 8 ++++++
...serial.patch => 055-pyserial-add_package.patch} | 0
patches/buildroot/056-makedevs.patch | 2 +
...pymysql.patch => 057-pymysql-add_package.patch} | 0
...lsa_work_with_eabi_and_large_file_options.patch | 4 +++
...61-mysql_client-reduce_installation_size.patch} | 7 ++++-
...patch => 064-tslib-add_alternate_dl_site.patch} | 2 +
....patch => 065-mpfr-add_alternate_dl_site.patch} | 2 +
...=> 066-add_alternate_site_functionnality.patch} | 2 +
patches/buildroot/067-libpcap_patch_failure.patch | 2 +
patches/buildroot/069-setserial_2.17-45.patch | 2 +
.../buildroot/073-php-fixes_download_site.patch | 2 +
...0-compiles_tslib_before_sdl_if_applicable.patch | 2 +
patches/buildroot/087-dont_hide_all_editors.patch | 4 ++-
...ch => 092-zlib-use_cp_instead_of_install.patch} | 0
.../093-sdl_ttf-add_freetype_dependancy.patch | 2 +
...6-libsndfile-updates_makefile_to_autotool.patch | 2 +-
25 files changed, 64 insertions(+), 18 deletions(-)
rename patches/buildroot/{038-fakeroot.patch => 038-fakeroot-bump_version.patch} (100%)
rename patches/buildroot/{055-pyserial.patch => 055-pyserial-add_package.patch} (100%)
rename patches/buildroot/{057-pymysql.patch => 057-pymysql-add_package.patch} (100%)
rename patches/buildroot/{061-mysql_client.patch => 061-mysql_client-reduce_installation_size.patch} (87%)
rename patches/buildroot/{064-add_tslib_alternate_site.patch => 064-tslib-add_alternate_dl_site.patch} (85%)
rename patches/buildroot/{065-add_mpfr_alternate_site.patch => 065-mpfr-add_alternate_dl_site.patch} (92%)
rename patches/buildroot/{066-add_autotool_alternate_site.patch => 066-add_alternate_site_functionnality.patch} (98%)
rename patches/buildroot/{092-zlib.patch => 092-zlib-use_cp_instead_of_install.patch} (100%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index b7a7f2e..0bf74ac 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-01-19 17:08:44.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-01-21 11:06:41.000000000 +0100
@@ -0,0 +1,712 @@
+ /*
+ * apf27.c
@@ -726,8 +726,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 17:21:40.000000000 +0100
-@@ -0,0 +1,1018 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-01-26 22:31:08.000000000 +0100
+@@ -0,0 +1,1019 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -1068,7 +1068,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int uart_mxc_port4_exit(struct platform_device *pdev)
+{
-+ mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart4_pins));
++ mxc_gpio_release_multiple_pins(mxc_uart4_pins,
++ ARRAY_SIZE(mxc_uart4_pins));
+
+ return 0;
+}
@@ -1749,7 +1750,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-01-19 17:08:44.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-01-21 11:06:41.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -1974,8 +1975,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-01-19 17:08:44.000000000 +0100
-@@ -0,0 +1,199 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-01-26 19:01:12.000000000 +0100
+@@ -0,0 +1,201 @@
+ /*
+ * apf27-dev-ext-apw.c
+ * Support for AFP27Dev's wireless extension board.
@@ -2071,12 +2072,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+ extension board */
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
+
-+#define BT_RESET (GPIO_PORTB | 14) /* CSI_D4 */
++#define BT_RESETn (GPIO_PORTB | 14) /* CSI_D4 */
+#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
+
+static int apw_bt_wifi_pins[] = {
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+ (BT_RESET | GPIO_OUT | GPIO_GPIO), /* Shared with CSI */
++ (BT_RESETn | GPIO_OUT | GPIO_GPIO), /* Shared with CSI */
+#endif
+ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
+};
@@ -2116,7 +2117,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+ int res;
+
+ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
-+
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ gpio_set_value(BT_RESETn, 1); /* Bluetooth on */
++#endif
+ res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
+ ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
+ if (!res)
@@ -2131,7 +2134,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+{
+#ifdef CONFIG_PM
+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+ gpio_set_value(BT_RESET, 0);
++ gpio_set_value(BT_RESETn, 1);
+# endif
+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
+ gpio_set_value(WIFI_PWRDNn, 1);
@@ -2146,7 +2149,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+{
+#ifdef CONFIG_PM
+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+ gpio_set_value(BT_RESET, 1);
++ gpio_set_value(BT_RESETn, 0);
+# endif
+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
+ gpio_set_value(WIFI_PWRDNn, 0);
diff --git a/patches/buildroot/038-fakeroot.patch b/patches/buildroot/038-fakeroot-bump_version.patch
similarity index 100%
rename from patches/buildroot/038-fakeroot.patch
rename to patches/buildroot/038-fakeroot-bump_version.patch
diff --git a/patches/buildroot/046-prboom-install_it_only_once.patch b/patches/buildroot/046-prboom-install_it_only_once.patch
index e26ddca..39185ac 100644
--- a/patches/buildroot/046-prboom-install_it_only_once.patch
+++ b/patches/buildroot/046-prboom-install_it_only_once.patch
@@ -2,6 +2,8 @@ Install PrBoom only once.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Integrated in latest BR.
+
Index: buildroot/package/games/prboom/prboom.mk
===================================================================
--- buildroot/package/games/prboom/prboom.mk (revision 23937)
diff --git a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
index 392e7af..6c79a48 100644
--- a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
+++ b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
@@ -1,6 +1,6 @@
"Calculate" BR2_LINUX26_VERSION when BR2_KERNEL_ADD_LATEST_MINORPATCH is used.
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
Signed-off-by: Julien Boibessot <jul...@ar...>
diff --git a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
index 66ae854..8a7a737 100644
--- a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
+++ b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
@@ -1,6 +1,6 @@
Download Kernel.org minor patches at the same time as full sources.
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
Signed-off-by: Julien Boibessot <jul...@ar...>
diff --git a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
index 6e18d3f..7986c6e 100644
--- a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
+++ b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
@@ -1,6 +1,6 @@
Stops Linux building when modules compilation fails.
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
Signed-off-by: Julien Boibessot <jul...@ar...>
diff --git a/patches/buildroot/051-u-boot.patch b/patches/buildroot/051-u-boot.patch
index 2697416..937ec89 100644
--- a/patches/buildroot/051-u-boot.patch
+++ b/patches/buildroot/051-u-boot.patch
@@ -1,3 +1,5 @@
+Never send to BR.
+
Index: buildroot/target/u-boot/Config.in
===================================================================
--- buildroot.orig/target/u-boot/Config.in 2008-11-03 09:15:09.000000000 +0100
diff --git a/patches/buildroot/053-libusb.patch b/patches/buildroot/053-libusb.patch
index 8ee4ff0..dfff8c8 100644
--- a/patches/buildroot/053-libusb.patch
+++ b/patches/buildroot/053-libusb.patch
@@ -1,3 +1,5 @@
+Latest BR downgrades to 0.1.12-10 from snapshot.debian.net
+
--- buildroot/package/libusb/libusb.mk~ 2008-11-21 09:15:25.000000000 +0100
+++ buildroot/package/libusb/libusb.mk 2008-11-22 18:12:18.000000000 +0100
@@ -4,7 +4,7 @@
diff --git a/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch b/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
index a7c9afb..8eee944 100644
--- a/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
+++ b/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
@@ -1,3 +1,11 @@
+Some systems might only want to install ntpdate without installing
+(and launching at each startup ntpd daemon). So makes the installation of
+ntpd selectable.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Would BR be interested ?
+
--- buildroot/package/ntp/Config.in 2008-11-03 09:15:26.000000000 +0100
+++ buildroot/package/ntp/Config.in 2008-11-26 12:11:59.000000000 +0100
@@ -6,6 +6,12 @@
diff --git a/patches/buildroot/055-pyserial.patch b/patches/buildroot/055-pyserial-add_package.patch
similarity index 100%
rename from patches/buildroot/055-pyserial.patch
rename to patches/buildroot/055-pyserial-add_package.patch
diff --git a/patches/buildroot/056-makedevs.patch b/patches/buildroot/056-makedevs.patch
index 0b7271b..8bfdbca 100644
--- a/patches/buildroot/056-makedevs.patch
+++ b/patches/buildroot/056-makedevs.patch
@@ -1,3 +1,5 @@
+Integrated in latest BR.
+
Signed-off-by: Jeremy Kerr
Signed-off-by: Thomas Petazzoni
diff --git a/patches/buildroot/057-pymysql.patch b/patches/buildroot/057-pymysql-add_package.patch
similarity index 100%
rename from patches/buildroot/057-pymysql.patch
rename to patches/buildroot/057-pymysql-add_package.patch
diff --git a/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch b/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
index 713ff3d..745c6d8 100644
--- a/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
+++ b/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
@@ -3,6 +3,10 @@ Deals with following points:
* pb when compiled with EABI
* pb when compiled with -D_FILE_OFFSET_BITS=64 flag
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Needs to be merged with latest BR modifications.
+
--- buildroot/package/audio/alsa-lib/alsa-lib.mk.org 2008-12-11 14:35:36.000000000 +0100
+++ buildroot/package/audio/alsa-lib/alsa-lib.mk 2008-12-11 14:43:07.000000000 +0100
@@ -11,14 +11,16 @@
diff --git a/patches/buildroot/061-mysql_client.patch b/patches/buildroot/061-mysql_client-reduce_installation_size.patch
similarity index 87%
rename from patches/buildroot/061-mysql_client.patch
rename to patches/buildroot/061-mysql_client-reduce_installation_size.patch
index 7f2ca6b..113b695 100644
--- a/patches/buildroot/061-mysql_client.patch
+++ b/patches/buildroot/061-mysql_client-reduce_installation_size.patch
@@ -1,3 +1,8 @@
+Help to reduce size of mysql client installation by adding an option to remove
+unneeded stuff for most everyday use.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
--- /home/fabien/virgin-armadeus/buildroot/package/database/mysql_client/Config.in 2008-12-15 13:18:29.000000000 +0100
+++ buildroot/package/database/mysql_client/Config.in 2008-12-15 11:00:35.000000000 +0100
@@ -2,3 +2,21 @@ config BR2_PACKAGE_MYSQL_CLIENT
@@ -9,7 +14,7 @@
+config BR2_PACKAGE_MYSQL_CLIENT_SHRINK
+ bool "MySQL client shrink"
+ help
-+ Reduce the size of MySQL package suppressing:
++ Reduce the size of MySQL package by suppressing:
+ usr/mysql-test/
+ usr/sql-bench/
+ usr/bin/mysql_client_test
diff --git a/patches/buildroot/064-add_tslib_alternate_site.patch b/patches/buildroot/064-tslib-add_alternate_dl_site.patch
similarity index 85%
rename from patches/buildroot/064-add_tslib_alternate_site.patch
rename to patches/buildroot/064-tslib-add_alternate_dl_site.patch
index 61775a8..c7e883c 100644
--- a/patches/buildroot/064-add_tslib_alternate_site.patch
+++ b/patches/buildroot/064-tslib-add_alternate_dl_site.patch
@@ -1,3 +1,5 @@
+Not needed for latest BR as tslib package moved to autotools infrastructure.
+
--- buildroot/package/tslib/tslib.mk.ref 2009-01-01 17:19:34.000000000 +0100
+++ buildroot/package/tslib/tslib.mk 2009-01-03 18:56:28.000000000 +0100
@@ -10,7 +10,8 @@
diff --git a/patches/buildroot/065-add_mpfr_alternate_site.patch b/patches/buildroot/065-mpfr-add_alternate_dl_site.patch
similarity index 92%
rename from patches/buildroot/065-add_mpfr_alternate_site.patch
rename to patches/buildroot/065-mpfr-add_alternate_dl_site.patch
index e9896dd..9f1f803 100644
--- a/patches/buildroot/065-add_mpfr_alternate_site.patch
+++ b/patches/buildroot/065-mpfr-add_alternate_dl_site.patch
@@ -1,3 +1,5 @@
+Not needed in latest BR as mpfr now uses DOWNLOAD macro.
+
--- buildroot/package/mpfr/mpfr.mk.ori 2008-11-03 09:15:26.000000000 +0100
+++ buildroot/package/mpfr/mpfr.mk 2009-01-03 17:47:34.000000000 +0100
@@ -21,11 +21,13 @@
diff --git a/patches/buildroot/066-add_autotool_alternate_site.patch b/patches/buildroot/066-add_alternate_site_functionnality.patch
similarity index 98%
rename from patches/buildroot/066-add_autotool_alternate_site.patch
rename to patches/buildroot/066-add_alternate_site_functionnality.patch
index bf9ea5f..137d855 100644
--- a/patches/buildroot/066-add_autotool_alternate_site.patch
+++ b/patches/buildroot/066-add_alternate_site_functionnality.patch
@@ -1,3 +1,5 @@
+Integrated in latest BR.
+
--- buildroot/package/Makefile.autotools.in.ori 2008-11-03 09:15:31.000000000 +0100
+++ buildroot/package/Makefile.autotools.in 2009-01-03 20:17:03.000000000 +0100
@@ -135,16 +135,20 @@
diff --git a/patches/buildroot/067-libpcap_patch_failure.patch b/patches/buildroot/067-libpcap_patch_failure.patch
index 64331f8..b8e33e9 100644
--- a/patches/buildroot/067-libpcap_patch_failure.patch
+++ b/patches/buildroot/067-libpcap_patch_failure.patch
@@ -1,3 +1,5 @@
+Probably no more needed with latest BR.
+
diff -urN buildroot/package.ori/libpcap/libpcap.mk buildroot/package/libpcap/libpcap.mk
--- buildroot/package.ori/libpcap/libpcap.mk 2008-11-03 09:15:26.000000000 +0100
+++ buildroot/package/libpcap/libpcap.mk 2009-01-05 22:42:26.000000000 +0100
diff --git a/patches/buildroot/069-setserial_2.17-45.patch b/patches/buildroot/069-setserial_2.17-45.patch
index 2225cd9..66148a1 100644
--- a/patches/buildroot/069-setserial_2.17-45.patch
+++ b/patches/buildroot/069-setserial_2.17-45.patch
@@ -1,3 +1,5 @@
+No more needed in latest BR.
+
--- buildroot/package/setserial/setserial.mk.ori 2008-11-03 09:15:29.000000000 +0100
+++ buildroot/package/setserial/setserial.mk 2009-01-08 01:49:45.000000000 +0100
@@ -4,10 +4,11 @@
diff --git a/patches/buildroot/073-php-fixes_download_site.patch b/patches/buildroot/073-php-fixes_download_site.patch
index 52a608d..5f2db45 100644
--- a/patches/buildroot/073-php-fixes_download_site.patch
+++ b/patches/buildroot/073-php-fixes_download_site.patch
@@ -1,3 +1,5 @@
+Not needed in latest BR.
+
--- buildroot/package/php/php.mk.org 2009-04-28 15:45:51.000000000 +0200
+++ buildroot/package/php/php.mk 2009-04-28 15:57:47.000000000 +0200
@@ -5,7 +5,7 @@
diff --git a/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch b/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
index bc2e418..49dae26 100644
--- a/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
+++ b/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
@@ -4,6 +4,8 @@ touchscreen's support in SDL is crappy.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Integrated by BR for 2010.02.
+
Index: buildroot/package/sdl/sdl.mk
===================================================================
--- buildroot.orig/package/sdl/sdl.mk 2009-06-23 18:44:22.000000000 +0200
diff --git a/patches/buildroot/087-dont_hide_all_editors.patch b/patches/buildroot/087-dont_hide_all_editors.patch
index f494eca..d6899cf 100644
--- a/patches/buildroot/087-dont_hide_all_editors.patch
+++ b/patches/buildroot/087-dont_hide_all_editors.patch
@@ -2,8 +2,10 @@
Don't hide all editors in config if BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is selected.
Indeed vi is the only editor already provided by busybox.
-
Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Integrated in BR for 2010.02.
+
---
Index: buildroot/package/Config.in
diff --git a/patches/buildroot/092-zlib.patch b/patches/buildroot/092-zlib-use_cp_instead_of_install.patch
similarity index 100%
rename from patches/buildroot/092-zlib.patch
rename to patches/buildroot/092-zlib-use_cp_instead_of_install.patch
diff --git a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
index bd7560c..5eb9517 100644
--- a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
+++ b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
@@ -2,6 +2,8 @@ SDL_ttf needs freetype to be built and installed first.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Integrated by BR for 2010.02
+
Index: buildroot/package/sdl_ttf/sdl_ttf.mk
===================================================================
--- buildroot.orig/package/sdl_ttf/sdl_ttf.mk 2009-12-11 10:14:53.000000000 +0100
diff --git a/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
index e7c77b3..e20b324 100644
--- a/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
+++ b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
@@ -1,6 +1,6 @@
Moves libsndfile to autotools infrastructure and bump version to 1.0.21.
-Will be removed or merged when updating to Buildroot 2010.02 (send 1.0.21
+Will have to be merged when updating to Buildroot 2010.02 (send 1.0.21
modifications upstream; remove STRIP hack before)
Signed-off-by: Julien Boibessot <jul...@ar...>
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-01-25 13:27:18
|
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 f3addf0634096076dc613602bb0baff83a2fab79 (commit)
via cc625a5e6016b003041ecaa4cbb650723b8e28d6 (commit)
via 23b60820f494cb35f139c123f35124b12088cc9e (commit)
via ecf4bec4855b046bdd27b6b28c3d0df449a84198 (commit)
via 9cc014877a22f65317c985e8ed9375071cec2899 (commit)
from b3eb290689befdb90a9af36e1ce74af307d1b400 (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 f3addf0634096076dc613602bb0baff83a2fab79
Merge: cc625a5e6016b003041ecaa4cbb650723b8e28d6 b3eb290689befdb90a9af36e1ce74af307d1b400
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 14:20:47 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit cc625a5e6016b003041ecaa4cbb650723b8e28d6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 13:47:42 2010 +0100
[BUILDROOT] Removes unused/unapplied sdl_ttf patch
commit 23b60820f494cb35f139c123f35124b12088cc9e
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 12:25:18 2010 +0100
Updates buildroot/package/.gitignore
commit ecf4bec4855b046bdd27b6b28c3d0df449a84198
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 12:22:38 2010 +0100
[BUILDROOT] Merge curl -> libcurl transition in one single patch
commit 9cc014877a22f65317c985e8ed9375071cec2899
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 11:08:01 2010 +0100
[BUILDROOT] Comments some uClibc patches
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 11 --
buildroot/package/libcurl/Config.in | 13 --
.../libcurl-7.19.2-fix-ssl-no-verbose.patch | 25 ----
buildroot/package/libcurl/libcurl.mk | 29 ----
.../sdl/sdl_ttf-2.0.8-freetype-includes.patch | 29 ----
...-0.9.29-fix-max_baud_rate_setting_for_arm.patch | 5 +
.../uClibc/uClibc-0.9.29-fix-spin_locks.patch | 10 +-
patches/buildroot/068-upgrade_to_libcurl.patch | 144 ++++++++++++++++----
patches/buildroot/cleanup_buildroot.sh | 2 +
9 files changed, 134 insertions(+), 134 deletions(-)
delete mode 100644 buildroot/package/libcurl/Config.in
delete mode 100644 buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
delete mode 100644 buildroot/package/libcurl/libcurl.mk
delete mode 100644 buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index aedc788..29bfb0f 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -8,25 +8,14 @@
/buildroot-libtool.patch
# except:
-!/ad9889ctrl/
!/allegro/
!/armadeus/
-!/armadeus-drivers-helpers/
-!/armadeus-testsuite/
-!/as_devices/
!/audio/
!/bluez/
-!/ch7024ctrl/
!/fbgrab/
!/fbtest/
-!/fpgaregs/
-!/freescale-tools/
-!/imxregs/
-!/imxssi/
!/lcd4linux/
-!/libcurl/
!/lmbench/
-!/max5821ctrl/
!/mesa/
!/mplayer/
!/mtd/
diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in
deleted file mode 100644
index 1d6d08e..0000000
--- a/buildroot/package/libcurl/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_LIBCURL
- bool "libcurl"
- help
- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
- and Dict servers, using any of the supported protocols.
-
- http://curl.haxx.nu/
-
-config BR2_PACKAGE_CURL
- bool "curl binary"
- depends on BR2_PACKAGE_LIBCURL
- help
- Install curl binary as well
diff --git a/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch b/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
deleted file mode 100644
index b15ed96..0000000
--- a/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-ssluse.c: fix build breakage with --with-ssl --disable-verbose
-
-Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
-but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
-
-Signed-off-by: Peter Korsgaard <ja...@su...>
----
- lib/ssluse.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-Index: curl-7.19.2/lib/ssluse.c
-===================================================================
---- curl-7.19.2.orig/lib/ssluse.c
-+++ curl-7.19.2/lib/ssluse.c
-@@ -923,10 +923,6 @@
- int i;
- int year=0,month=0,day=0,hour=0,minute=0,second=0;
-
--#ifdef CURL_DISABLE_VERBOSE_STRINGS
-- (void)prefix;
--#endif
--
- i=tm->length;
- asn1_string=(const char *)tm->data;
-
diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk
deleted file mode 100644
index d62a0e9..0000000
--- a/buildroot/package/libcurl/libcurl.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#############################################################
-#
-# libcurl
-#
-#############################################################
-LIBCURL_VERSION = 7.19.2
-LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
-LIBCURL_SITE = http://curl.haxx.se/download/
-LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
- $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBCURL_DEPENDENCIES += openssl
-LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
-endif
-
-$(eval $(call AUTOTARGETS,package,libcurl))
-
-$(LIBCURL_HOOK_POST_INSTALL):
- rm -rf $(TARGET_DIR)/usr/bin/curl-config \
- $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
- touch $@
-
-curl: libcurl
-curl-clean: libcurl-clean
-curl-dirclean: libcurl-dirclean
-curl-source: libcurl-source
diff --git a/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch b/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
deleted file mode 100644
index 1e16bc7..0000000
--- a/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN -X dontdiff SDL_ttf-2.0.8/SDL_ttf.c SDL_ttf-2.0.8.mod/SDL_ttf.c
---- SDL_ttf-2.0.8/SDL_ttf.c 2006-05-01 11:26:17.000000000 +0200
-+++ SDL_ttf-2.0.8.mod/SDL_ttf.c 2008-07-12 19:56:49.000000000 +0200
-@@ -43,16 +43,6 @@
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
- #include FT_TRUETYPE_IDS_H
--/*
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--*/
--#include <freetype/internal/ftobjs.h>
--
--#ifndef FT_OPEN_STREAM
--#define FT_OPEN_STREAM ft_open_stream
--#endif
-
- #include "SDL.h"
- #include "SDL_endian.h"
-@@ -278,7 +268,7 @@
- }
- memset(stream, 0, sizeof(*stream));
-
-- stream->memory = library->memory;
-+ stream->memory = NULL; /* set by FT_Open_Face */
- stream->read = RWread;
- stream->descriptor.pointer = src;
- stream->pos = (unsigned long)position;
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
index 9f5681e..db84e14 100644
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
@@ -1,3 +1,8 @@
+uClibc 0.9.29 limits terminal baud rate to 115200 by default. Removes this
+limitation.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
===================================================================
--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2009-12-10 15:05:16.000000000 +0100
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
index 5addc5c..92b5f87 100644
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
@@ -1,3 +1,7 @@
+Spinlocks are still not yet implemented in uClibc for ARM targets.
+However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
+If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
+
diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
+++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
@@ -5,9 +9,9 @@ diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0
/* We support the Timeouts option. */
#define _POSIX_TIMEOUTS 200112L
-+/* Armadeus Patch: Spinlock is still not yet implemented in UcLibc for Arm */
-+/* targets. However, Xenomai-2.4.3 use this flags to enable or not */
-+/* spinlocking. If this define is set, Xenomai will fail to compile */
++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
++ * in uClibc for ARM targets.
++ */
/* We support spinlocks. */
-#define _POSIX_SPIN_LOCKS 200112L
+/* #define _POSIX_SPIN_LOCKS 200112L */
diff --git a/patches/buildroot/068-upgrade_to_libcurl.patch b/patches/buildroot/068-upgrade_to_libcurl.patch
index 6461e81..af05137 100644
--- a/patches/buildroot/068-upgrade_to_libcurl.patch
+++ b/patches/buildroot/068-upgrade_to_libcurl.patch
@@ -1,5 +1,13 @@
---- buildroot/package/Config.in.ref 2009-01-05 22:57:30.000000000 +0100
-+++ buildroot/package/Config.in 2009-01-06 00:11:31.000000000 +0100
+Upgrades from package/curl/ @ 7.17.1 to package/libcurl/ @ 7.19.2
+
+Will be removed when updating to latest Builroot.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 11:36:59.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 11:47:38.000000000 +0100
@@ -145,7 +145,6 @@
source "package/boa/Config.in"
source "package/bind/Config.in"
@@ -16,9 +24,10 @@
source "package/libeXosip2/Config.in"
source "package/libosip2/Config.in"
source "package/libpcap/Config.in"
-diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
---- buildroot/package/curl.ori/Config.in 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/Config.in 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/Config.in
+===================================================================
+--- buildroot.orig/package/curl/Config.in 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_CURL
- bool "curl"
@@ -35,9 +44,10 @@ diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
- and Dict servers, using any of the supported protocols.
-
- http://curl.haxx.nu/
-diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/curl/curl-7.10.4-path.patch
---- buildroot/package/curl.ori/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.10.4-path.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.10.4-path.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- curl-7.10.4/lib/Makefile.am
-+++ curl-7.10.4/lib/Makefile.am
@@ -52,9 +62,10 @@ diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/cu
- fi
-
- # this hook is mainly for non-unix systems to build even if configure
-diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/curl/curl-7.12.0-nousr.patch
---- buildroot/package/curl.ori/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.12.0-nousr.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.12.0-nousr.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- curl-7.12.0/configure.ac.orig 2004-05-25 23:43:39.000000000 +0200
-+++ curl-7.12.0/configure.ac 2004-07-26 15:12:03.029071072 +0200
@@ -72,9 +83,10 @@ diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/c
-+ LDFLAGS="$CLEANLDFLAGS"
- CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
- AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
-diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/package/curl/curl-7.13.1-2005-3185.patch
---- buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-2005-3185.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-2005-3185.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- curl-7.13.1/lib/http_ntlm.c.2005-3185 2005-02-22 13:10:30.000000000 +0100
-+++ curl-7.13.1/lib/http_ntlm.c 2005-10-19 15:18:42.165859528 +0200
@@ -92,9 +104,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/packa
- memcpy(&ntlmbuf[size], domain, domlen);
- size += domlen;
-
-diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/curl/curl-7.13.1-auth.patch
---- buildroot/package/curl.ori/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-auth.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-auth.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
---- curl-7.13.1/lib/http.c.pom 2005-02-19 00:53:07.000000000 +0100
-+++ curl-7.13.1/lib/http.c 2005-04-27 11:48:40.000000000 +0200
@@ -144,9 +157,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/cu
- };
-
- struct hostname {
-diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
---- buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
---- curl-7.13.1/lib/url.c.cve-2005-4077 2005-12-08 13:08:03.000000000 +0100
-+++ curl-7.13.1/lib/url.c 2005-12-08 13:15:56.565790336 +0100
@@ -171,9 +185,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/p
- if(NULL == conn->host.rawalloc)
- return CURLE_OUT_OF_MEMORY;
- conn->host.name = conn->host.rawalloc;
-diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
---- buildroot/package/curl.ori/curl.mk 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl.mk 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl.mk
+===================================================================
+--- buildroot.orig/package/curl/curl.mk 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#############################################################
-#
@@ -272,4 +287,85 @@ diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
-ifeq ($(strip $(BR2_PACKAGE_LIBCURL)),y)
-TARGETS+=libcurl
-endif
-
+Index: buildroot/package/libcurl/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/Config.in 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_LIBCURL
++ bool "libcurl"
++ help
++ cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
++ and Dict servers, using any of the supported protocols.
++
++ http://curl.haxx.nu/
++
++config BR2_PACKAGE_CURL
++ bool "curl binary"
++ depends on BR2_PACKAGE_LIBCURL
++ help
++ Install curl binary as well
+Index: buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,25 @@
++ssluse.c: fix build breakage with --with-ssl --disable-verbose
++
++Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
++but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
++
++Signed-off-by: Peter Korsgaard <ja...@su...>
++---
++ lib/ssluse.c | 4 ----
++ 1 file changed, 4 deletions(-)
++
++Index: curl-7.19.2/lib/ssluse.c
++===================================================================
++--- curl-7.19.2.orig/lib/ssluse.c
+++++ curl-7.19.2/lib/ssluse.c
++@@ -923,10 +923,6 @@
++ int i;
++ int year=0,month=0,day=0,hour=0,minute=0,second=0;
++
++-#ifdef CURL_DISABLE_VERBOSE_STRINGS
++- (void)prefix;
++-#endif
++-
++ i=tm->length;
++ asn1_string=(const char *)tm->data;
++
+Index: buildroot/package/libcurl/libcurl.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/libcurl.mk 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,29 @@
++#############################################################
++#
++# libcurl
++#
++#############################################################
++LIBCURL_VERSION = 7.19.2
++LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
++LIBCURL_SITE = http://curl.haxx.se/download/
++LIBCURL_INSTALL_STAGING = YES
++LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
++ $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
++
++ifeq ($(BR2_PACKAGE_OPENSSL),y)
++LIBCURL_DEPENDENCIES += openssl
++LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
++LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
++endif
++
++$(eval $(call AUTOTARGETS,package,libcurl))
++
++$(LIBCURL_HOOK_POST_INSTALL):
++ rm -rf $(TARGET_DIR)/usr/bin/curl-config \
++ $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
++ touch $@
++
++curl: libcurl
++curl-clean: libcurl-clean
++curl-dirclean: libcurl-dirclean
++curl-source: libcurl-source
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 42898d2..fa42d5b 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -12,3 +12,5 @@ rm -f buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-vers
rm -rf buildroot/package/uucp/
rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/audio/flite/
+rm -rf buildroot/package/libcurl/
+
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-01-25 13:12: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 b3eb290689befdb90a9af36e1ce74af307d1b400 (commit)
from e07b5858f9630769061ef5997e81ff63c38b6f3a (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 b3eb290689befdb90a9af36e1ce74af307d1b400
Author: nicolas colombain <nic...@ar...>
Date: Mon Jan 25 14:11:16 2010 +0100
[U-BOOT] add zero boot delay check
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/apf27/apf27.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 8a87e5e..0746c9e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -111,6 +111,7 @@
* Boot options. Setting delay to -1 stops autostart count down.
*/
#define CONFIG_BOOTDELAY 20
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
hooks/post-receive
--
armadeus
|
