# HG changeset patch # User mru # Date 1264897230 0 # Node ID 8327c5b4df9b428f8d5743e4f9e347cc2cef0389 # Parent a8e640f4f3881f869dfd9d7ece3c6d0da50fe066 Blackfin: use SRAM only when CONFIG_SRAM is set diff -r a8e640f4f388 -r 8327c5b4df9b bfin/config_bfin.h --- a/bfin/config_bfin.h Sat Jan 30 21:55:18 2010 +0000 +++ b/bfin/config_bfin.h Sun Jan 31 00:20:30 2010 +0000 @@ -31,11 +31,13 @@ #ifndef AVCODEC_BFIN_CONFIG_BFIN_H #define AVCODEC_BFIN_CONFIG_BFIN_H +#include "config.h" + #ifndef DEFUN #define mL3 .text #ifndef mL1 -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM #define mL1 .l1.text #else #define mL1 mL3 diff -r a8e640f4f388 -r 8327c5b4df9b bfin/dsputil_bfin.h --- a/bfin/dsputil_bfin.h Sat Jan 30 21:55:18 2010 +0000 +++ b/bfin/dsputil_bfin.h Sun Jan 31 00:20:30 2010 +0000 @@ -24,7 +24,7 @@ #ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H #define AVCODEC_BFIN_DSPUTIL_BFIN_H -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM #define attribute_l1_text __attribute__ ((l1_text)) #define attribute_l1_data_b __attribute__((l1_data_B)) #else diff -r a8e640f4f388 -r 8327c5b4df9b bfin/fdct_bfin.S --- a/bfin/fdct_bfin.S Sat Jan 30 21:55:18 2010 +0000 +++ b/bfin/fdct_bfin.S Sun Jan 31 00:20:30 2010 +0000 @@ -127,9 +127,10 @@ */ +#include "config.h" #include "config_bfin.h" -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.B,"aw",@progbits #else .data @@ -138,7 +139,7 @@ dct_coeff: .short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537; -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.A,"aw",@progbits #endif .align 4 diff -r a8e640f4f388 -r 8327c5b4df9b bfin/idct_bfin.S --- a/bfin/idct_bfin.S Sat Jan 30 21:55:18 2010 +0000 +++ b/bfin/idct_bfin.S Sun Jan 31 00:20:30 2010 +0000 @@ -55,9 +55,10 @@ */ +#include "config.h" #include "config_bfin.h" -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.B,"aw",@progbits #else .data @@ -76,7 +77,7 @@ .short 0x18F9; //cos(7pi/16) .short 0x7D8A; //cos(pi/16) -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.A,"aw",@progbits #endif diff -r a8e640f4f388 -r 8327c5b4df9b bfin/vp3_idct_bfin.S --- a/bfin/vp3_idct_bfin.S Sat Jan 30 21:55:18 2010 +0000 +++ b/bfin/vp3_idct_bfin.S Sun Jan 31 00:20:30 2010 +0000 @@ -28,9 +28,10 @@ */ +#include "config.h" #include "config_bfin.h" -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.B,"aw",@progbits #else .data @@ -49,7 +50,7 @@ .short 0x18F9; //cos(7pi/16) .short 0x7D8A; //cos(pi/16) -#ifdef __FDPIC__ +#if defined(__FDPIC__) && CONFIG_SRAM .section .l1.data.A #endif