Merge remote-tracking branch 'github/master'

pull/34/head^2
Bogdan Marinescu 2013-08-15 15:18:52 +03:00
commit 1e4c9bed66
2 changed files with 4 additions and 23 deletions

View File

@ -116,25 +116,6 @@ SECTIONS
} > RAM
/* Code can explicitly ask for data to be
placed in these higher RAM banks where
they will be left uninitialized.
*/
.AHBSRAM0 (NOLOAD):
{
Image$$RW_IRAM2$$Base = . ;
*(AHBSRAM0)
Image$$RW_IRAM2$$ZI$$Limit = .;
} > USB_RAM
.AHBSRAM1 (NOLOAD):
{
Image$$RW_IRAM3$$Base = . ;
*(AHBSRAM1)
Image$$RW_IRAM3$$ZI$$Limit = .;
} > ETH_RAM
.bss :
{
__bss_start__ = .;

View File

@ -139,11 +139,11 @@ struct lpc_enetdata {
# define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
# endif
#else
# define ETHMEM_SECTION ALIGNED(8)
#endif
#if defined(TARGET_LPC1768) && defined(TOOLCHAIN_GCC_ARM)
#define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
# define ETHMEM_SECTION __attribute__((section("AHBSRAM1"),aligned))
#else
# define ETHMEM_SECTION ALIGNED(8)
#endif
#endif
/** \brief LPC EMAC driver work data