Commit 2881f3ae authored by mru's avatar mru

Blackfin: use SRAM only when CONFIG_SRAM is set

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21565 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fbef1acc
...@@ -31,11 +31,13 @@ DEFUN(put_pixels_clamped,mL1, ...@@ -31,11 +31,13 @@ DEFUN(put_pixels_clamped,mL1,
#ifndef AVCODEC_BFIN_CONFIG_BFIN_H #ifndef AVCODEC_BFIN_CONFIG_BFIN_H
#define AVCODEC_BFIN_CONFIG_BFIN_H #define AVCODEC_BFIN_CONFIG_BFIN_H
#include "config.h"
#ifndef DEFUN #ifndef DEFUN
#define mL3 .text #define mL3 .text
#ifndef mL1 #ifndef mL1
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
#define mL1 .l1.text #define mL1 .l1.text
#else #else
#define mL1 mL3 #define mL1 mL3
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H #ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H
#define 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_text __attribute__ ((l1_text))
#define attribute_l1_data_b __attribute__((l1_data_B)) #define attribute_l1_data_b __attribute__((l1_data_B))
#else #else
......
...@@ -127,9 +127,10 @@ root:/u/ffmpeg/bhead/libavcodec> ...@@ -127,9 +127,10 @@ root:/u/ffmpeg/bhead/libavcodec>
*/ */
#include "config.h"
#include "config_bfin.h" #include "config_bfin.h"
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits .section .l1.data.B,"aw",@progbits
#else #else
.data .data
...@@ -138,7 +139,7 @@ root:/u/ffmpeg/bhead/libavcodec> ...@@ -138,7 +139,7 @@ root:/u/ffmpeg/bhead/libavcodec>
dct_coeff: dct_coeff:
.short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537; .short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537;
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A,"aw",@progbits .section .l1.data.A,"aw",@progbits
#endif #endif
.align 4 .align 4
......
...@@ -55,9 +55,10 @@ IDCT BFINidct: 88.3 kdct/s ...@@ -55,9 +55,10 @@ IDCT BFINidct: 88.3 kdct/s
*/ */
#include "config.h"
#include "config_bfin.h" #include "config_bfin.h"
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits .section .l1.data.B,"aw",@progbits
#else #else
.data .data
...@@ -76,7 +77,7 @@ coefs: ...@@ -76,7 +77,7 @@ coefs:
.short 0x18F9; //cos(7pi/16) .short 0x18F9; //cos(7pi/16)
.short 0x7D8A; //cos(pi/16) .short 0x7D8A; //cos(pi/16)
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A,"aw",@progbits .section .l1.data.A,"aw",@progbits
#endif #endif
......
...@@ -28,9 +28,10 @@ Registers Used : A0, A1, R0-R7, I0-I3, B0, B2, B3, M0-M2, L0-L3, P0-P5, LC0. ...@@ -28,9 +28,10 @@ Registers Used : A0, A1, R0-R7, I0-I3, B0, B2, B3, M0-M2, L0-L3, P0-P5, LC0.
*/ */
#include "config.h"
#include "config_bfin.h" #include "config_bfin.h"
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits .section .l1.data.B,"aw",@progbits
#else #else
.data .data
...@@ -49,7 +50,7 @@ coefs: ...@@ -49,7 +50,7 @@ coefs:
.short 0x18F9; //cos(7pi/16) .short 0x18F9; //cos(7pi/16)
.short 0x7D8A; //cos(pi/16) .short 0x7D8A; //cos(pi/16)
#ifdef __FDPIC__ #if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A .section .l1.data.A
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment