Commit 9863553f authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

packages: all salute the passing of avr32 



Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 188c0a31

package/aiccu/Config.in

+0 −5
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ config BR2_PACKAGE_AICCU 
	depends on BR2_USE_MMU # fork()

	# Uses dn_skipname(), only available since 0.9.33

	depends on !BR2_UCLIBC_VERSION_0_9_31

	# AVR32 only has uClibc 0.9.31, so there's no way it can build

	# due to the lack of dn_skipname(), even with external

	# toolchains.

	depends on !BR2_avr32

	# Triggers the _gp link issue

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
@@ -31,6 +27,5 @@ config BR2_PACKAGE_AICCU 
comment "aiccu needs a toolchain w/ IPv6, wchar, threads"

	depends on BR2_USE_MMU

	depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)

	depends on !BR2_avr32

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305

	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

package/alsa-lib/0001-avr32-bad-inline.patch

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h

--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100

+++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100

@@ -611,6 +611,13 @@

 			   snd_pcm_hw_param_t var);

 int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,

 			  snd_pcm_hw_param_t var, unsigned int val, int dir);

+

+#if	defined(AVR32_INLINE_BUG)

+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,

+						snd_pcm_format_t val);

+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,

+				     snd_pcm_subformat_t val);

+#else

 static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,

 						snd_pcm_format_t val)

 {

@@ -624,7 +631,7 @@

 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,

 				     (unsigned long) val, 0);

 }

-

+#endif

 int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,

 			      snd_pcm_hw_param_t var, unsigned int val, int dir);

 int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,

diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c

--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100

+++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100

@@ -26,6 +26,7 @@

  *

  */

   

+

 #include <byteswap.h>

 #include <math.h>

 #include "pcm_local.h"

@@ -106,6 +107,23 @@

 

 #endif /* DOC_HIDDEN */

 

+

+#if	defined(AVR32_INLINE_BUG)

+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,

+						snd_pcm_format_t val)

+{

+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,

+				     (unsigned long) val, 0);

+}

+

+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,

+				     snd_pcm_subformat_t val)

+{

+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,

+				     (unsigned long) val, 0);

+}

+#endif

+

 static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,

 					snd_pcm_uframes_t dst_offset,

 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,

@@ -483,6 +501,8 @@

 				  snd_pcm_uframes_t frames,

 				  snd_pcm_route_params_t *params)

 {

+#if	defined(AVR32_INLINE_BUG)

+#endif

 	unsigned int dst_channel;

 	snd_pcm_route_ttable_dst_t *dstp;

 	const snd_pcm_channel_area_t *dst_area;

@@ -551,8 +571,20 @@

 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,

 				   &saccess_mask);

 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {

+#if	defined(AVR32_INLINE_BUG)

+/* Start of  of problem */

+#endif

 		_snd_pcm_hw_params_set_format(sparams, route->sformat);

 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);

+#if	0

+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,

+				     (unsigned long) route->sformat, 0);

+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,

+				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);

+#endif

+#if	defined(AVR32_INLINE_BUG)

+/* End of problem */

+#endif

 	}

 	if (route->schannels >= 0) {

 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,

package/alsa-lib/alsa-lib.mk

+0 −4
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y) 
ALSA_LIB_CONF_OPTS += --disable-old-symbols

endif



ifeq ($(BR2_avr32),y)

ALSA_LIB_CFLAGS += -DAVR32_INLINE_BUG

endif



ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)

ALSA_LIB_CONF_OPTS += \

	--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \

package/avrdude/Config.in

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ config BR2_PACKAGE_AVRDUDE 
	depends on BR2_LARGEFILE # elfutils

	depends on BR2_USE_WCHAR # elfutils

	depends on !BR2_STATIC_LIBS # elfutils

	depends on !BR2_avr32 # elfutils

	depends on !BR2_bfin # elfutils

	help

	  avrdude is a programmer for Atmel AVR microcontrollers
@@ -18,5 +17,4 @@ config BR2_PACKAGE_AVRDUDE 


comment "avrdude needs a toolchain w/ threads, largefile, wchar, dynamic library"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS

	depends on !BR2_avr32

	depends on !BR2_bfin

package/bdwgc/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_BDWGC_ARCH_SUPPORTS

	bool

	default y

	depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_i386 \

	depends on BR2_arm || BR2_armeb || BR2_i386 \

		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_sh \

		|| BR2_sparc || BR2_x86_64