From 2a8246c278369437bd1e3d6160e407180505be81 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 1 Aug 2012 03:31:55 +0000 Subject: sim: bfin: set bfrom alias field to correct size When the sim is built w/out the bfroms, we end up passing a length of 0 when mapping the rom region which the core sim code rejects. So add an alias field equal to the length to avoid that error. Signed-off-by: Mike Frysinger --- sim/bfin/ChangeLog | 7 +++++++ sim/bfin/machs.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'sim') diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 49f2d6b312d..8283086b036 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,10 @@ +2012-07-31 Mike Frysinger + + * machs.c (bf54x_roms): Pass 0x1000 to alias field of BFROM, and + 0x10000 to the alias field of BFROMA. + (bf561_roms): Pass 0x1000 to alias field of BFROM. + (bf59x_roms): Pass 0x10000 to alias field of BFROMA. + 2012-07-31 Mike Frysinger * machs.c (bfin_reg_fetch): Change return 0 to return -1, and diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c index 04e39b597ca..4e5a694bf1c 100644 --- a/sim/bfin/machs.c +++ b/sim/bfin/machs.c @@ -1619,27 +1619,27 @@ static const struct bfrom bf538_roms[] = }; static const struct bfrom bf54x_roms[] = { - BFROM (54x, 4, 0), - BFROM (54x, 2, 0), - BFROM (54x, 1, 0), - BFROM (54x, 0, 0), - BFROMA (0xffa14000, 54x_l1, 4, 0), - BFROMA (0xffa14000, 54x_l1, 2, 0), - BFROMA (0xffa14000, 54x_l1, 1, 0), - BFROMA (0xffa14000, 54x_l1, 0, 0), + BFROM (54x, 4, 0x1000), + BFROM (54x, 2, 0x1000), + BFROM (54x, 1, 0x1000), + BFROM (54x, 0, 0x1000), + BFROMA (0xffa14000, 54x_l1, 4, 0x10000), + BFROMA (0xffa14000, 54x_l1, 2, 0x10000), + BFROMA (0xffa14000, 54x_l1, 1, 0x10000), + BFROMA (0xffa14000, 54x_l1, 0, 0x10000), BFROM_STUB, }; static const struct bfrom bf561_roms[] = { /* XXX: No idea what the actual wrap limit is here. */ - BFROM (561, 5, 0), + BFROM (561, 5, 0x1000), BFROM_STUB, }; static const struct bfrom bf59x_roms[] = { BFROM (59x, 1, 0x1000000), BFROM (59x, 0, 0x1000000), - BFROMA (0xffa10000, 59x_l1, 1, 0), + BFROMA (0xffa10000, 59x_l1, 1, 0x10000), BFROM_STUB, }; -- cgit v1.2.1