diff options
Diffstat (limited to 'arch/ppc/boot')
-rw-r--r-- | arch/ppc/boot/simple/embed_config.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c index 8dd5fb0fb775..f6ce7e74f872 100644 --- a/arch/ppc/boot/simple/embed_config.c +++ b/arch/ppc/boot/simple/embed_config.c | |||
@@ -784,28 +784,12 @@ embed_config(bd_t ** bdp) | |||
784 | #ifdef CONFIG_IBM_OPENBIOS | 784 | #ifdef CONFIG_IBM_OPENBIOS |
785 | /* This could possibly work for all treeboot roms. | 785 | /* This could possibly work for all treeboot roms. |
786 | */ | 786 | */ |
787 | #if defined(CONFIG_BEECH) || defined(CONFIG_BUBINGA) | 787 | #if defined(CONFIG_BUBINGA) |
788 | #define BOARD_INFO_VECTOR 0xFFF80B50 /* openbios 1.19 moved this vector down - armin */ | 788 | #define BOARD_INFO_VECTOR 0xFFF80B50 /* openbios 1.19 moved this vector down - armin */ |
789 | #else | 789 | #else |
790 | #define BOARD_INFO_VECTOR 0xFFFE0B50 | 790 | #define BOARD_INFO_VECTOR 0xFFFE0B50 |
791 | #endif | 791 | #endif |
792 | 792 | ||
793 | #ifdef CONFIG_BEECH | ||
794 | static void | ||
795 | get_board_info(bd_t **bdp) | ||
796 | { | ||
797 | typedef void (*PFV)(bd_t *bd); | ||
798 | ((PFV)(*(unsigned long *)BOARD_INFO_VECTOR))(*bdp); | ||
799 | return; | ||
800 | } | ||
801 | |||
802 | void | ||
803 | embed_config(bd_t **bdp) | ||
804 | { | ||
805 | *bdp = &bdinfo; | ||
806 | get_board_info(bdp); | ||
807 | } | ||
808 | #else /* !CONFIG_BEECH */ | ||
809 | void | 793 | void |
810 | embed_config(bd_t **bdp) | 794 | embed_config(bd_t **bdp) |
811 | { | 795 | { |
@@ -860,7 +844,6 @@ embed_config(bd_t **bdp) | |||
860 | #endif | 844 | #endif |
861 | timebase_period_ns = 1000000000 / bd->bi_tbfreq; | 845 | timebase_period_ns = 1000000000 / bd->bi_tbfreq; |
862 | } | 846 | } |
863 | #endif /* CONFIG_BEECH */ | ||
864 | #endif /* CONFIG_IBM_OPENBIOS */ | 847 | #endif /* CONFIG_IBM_OPENBIOS */ |
865 | 848 | ||
866 | #ifdef CONFIG_EP405 | 849 | #ifdef CONFIG_EP405 |