Changeset 439ba77 in mainline


Ignore:
Timestamp:
2010-01-11T22:17:43Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fd608dc
Parents:
070e05a (diff), 9dcadb0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge yet more fixes for i460gx keyboard.

Location:
boot
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r070e05a r439ba77  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
     28
     29-include ../Makefile.config
    2830
    2931TMP = distroot

  • boot/arch/ia64/loader/Makefile

    r070e05a r439ba77  
    2929
    3030include Makefile.common
     31include ../../../../Makefile.config
    3132
    3233.PHONY: all clean

  • boot/arch/ia64/loader/Makefile.build

    r070e05a r439ba77  
    4949        boot.S
    5050
    51 ifeq ($(MACHINE),i460GX)
    52         RD_APPS += \
    53                 $(USPACEDIR)/srv/hw/char/i8042/i8042 \
    54                 $(USPACEDIR)/srv/hid/c_mouse/c_mouse
    55 endif
    56 
    5751OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5852COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(notdir $(COMPONENTS)))) $(INITRD).co

  • boot/arch/ia64/loader/Makefile.common

    r070e05a r439ba77  
    3131#
    3232
     33include ../../../../Makefile.config
    3334include ../../../Makefile.common
    3435
    … …  
    4445KERNELDIR = ../../../../kernel
    4546USPACEDIR = ../../../../uspace
     47
     48ifeq ($(MACHINE),i460GX)
     49        RD_SRVS += \
     50                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     51                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
     52endif
Note: See TracChangeset for help on using the changeset viewer.