===== arch/ppc/config.in 1.163 vs edited ===== --- 1.163/arch/ppc/config.in Tue Jan 14 09:08:28 2003 +++ edited/arch/ppc/config.in Tue Jan 14 16:08:59 2003 @@ -176,31 +176,27 @@ fi if [ "$CONFIG_GT64260" = "y" ]; then - mainmenu_option next_comment - comment 'Marvell/Galileo GT64260 Options' + mainmenu_option next_comment + comment 'Marvell/Galileo GT64260 Options' - dep_bool 'PCI Bus 0 Snooping Disable (experimental)' \ - CONFIG_GT64260_BUS_0_NOT_COHERENT $CONFIG_EXPERIMENTAL - dep_bool 'PCI Bus 1 Snooping Disable (experimental)' \ - CONFIG_GT64260_BUS_1_NOT_COHERENT $CONFIG_EXPERIMENTAL + dep_bool 'PCI Bus 0 Snooping Disable (experimental)' \ + CONFIG_GT64260_BUS_0_NOT_COHERENT $CONFIG_EXPERIMENTAL + dep_bool 'PCI Bus 1 Snooping Disable (experimental)' \ + CONFIG_GT64260_BUS_1_NOT_COHERENT $CONFIG_EXPERIMENTAL - if [ "$CONFIG_GT64260_BUS_0_NOT_COHERENT" = "y" \ - -o "$CONFIG_GT64260_BUS_1_NOT_COHERENT" = "y" ]; then - define_bool CONFIG_NOT_COHERENT_CACHE y - fi + if [ "$CONFIG_GT64260_BUS_0_NOT_COHERENT" = "y" \ + -o "$CONFIG_GT64260_BUS_1_NOT_COHERENT" = "y" ]; then + define_bool CONFIG_NOT_COHERENT_CACHE y + fi - bool 'Board uses PPCBoot' CONFIG_USE_PPCBOOT - if [ "$CONFIG_USE_PPCBOOT" = "y" ]; then - hex 'Base Address assigned by Firmware' CONFIG_GT64260_ORIG_REG_BASE 0xf8000000 - else - hex 'Base Address assigned by Firmware' CONFIG_GT64260_ORIG_REG_BASE 0x14000000 + bool 'Board uses PPCBoot' CONFIG_USE_PPCBOOT + hex 'Base Address assigned by Firmware' CONFIG_GT64260_ORIG_REG_BASE 0x14000000 - bool 'Change Base Address in Bootloader' CONFIG_GT64260_NEW_BASE - if [ "$CONFIG_GT64260_NEW_BASE" = "y" ]; then - hex 'New Base Address' CONFIG_GT64260_NEW_REG_BASE 0x14000000 - fi - fi - endmenu + bool 'Change Base Address in Linux/PPC Bootwrapper' CONFIG_GT64260_NEW_BASE + if [ "$CONFIG_GT64260_NEW_BASE" = "y" ]; then + hex 'New Base Address' CONFIG_GT64260_NEW_REG_BASE 0x14000000 + fi + endmenu fi if [ "$CONFIG_FORCE" = "y" -o "$CONFIG_MENF1" = "y" \