Changeset ef521d4 in mainline
- Timestamp:
- 2015-01-08T16:24:06Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 01784d2
- Parents:
- 8c7d5ad (diff), 66b3e0b (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. - Files:
-
- 14 added
- 4 edited
-
boot/Makefile (modified) (1 diff)
-
boot/arch/amd64/Makefile.inc (modified) (1 diff)
-
uspace/Makefile (modified) (1 diff)
-
uspace/Makefile.common (modified) (1 diff)
-
uspace/drv/bus/usb/ar9271/Makefile (added)
-
uspace/drv/bus/usb/ar9271/ar9271.c (added)
-
uspace/drv/bus/usb/ar9271/ar9271.fw (added)
-
uspace/drv/bus/usb/ar9271/ar9271.h (added)
-
uspace/drv/bus/usb/ar9271/ar9271.ma (added)
-
uspace/drv/bus/usb/ar9271/ath.h (added)
-
uspace/drv/bus/usb/ar9271/ath_usb.c (added)
-
uspace/drv/bus/usb/ar9271/ath_usb.h (added)
-
uspace/drv/bus/usb/ar9271/htc.c (added)
-
uspace/drv/bus/usb/ar9271/htc.h (added)
-
uspace/drv/bus/usb/ar9271/hw.c (added)
-
uspace/drv/bus/usb/ar9271/hw.h (added)
-
uspace/drv/bus/usb/ar9271/wmi.c (added)
-
uspace/drv/bus/usb/ar9271/wmi.h (added)
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile
r8c7d5ad ref521d4 115 115 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \ 116 116 done 117 for file in $(RD_DRV_FW) ; do \ 118 file_dir="`dirname "$$file"`" ; \ 119 file_name="`basename "$$file"`" ; \ 120 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \ 121 done 117 122 if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \ 118 123 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \ -
boot/arch/amd64/Makefile.inc
r8c7d5ad ref521d4 57 57 bus/usb/usbmast \ 58 58 bus/usb/usbmid \ 59 bus/usb/vhc 59 bus/usb/vhc \ 60 bus/usb/ar9271 60 61 61 62 RD_DRV_CFG += \ 62 63 bus/isa 64 65 RD_DRV_FW += \ 66 bus/usb/ar9271 63 67 64 68 RD_APPS_ESSENTIAL += \ -
uspace/Makefile
r8c7d5ad ref521d4 159 159 drv/bus/usb/usbmid \ 160 160 drv/bus/usb/vhc \ 161 drv/bus/usb/ar9271 \ 161 162 drv/nic/ne2k \ 162 163 drv/nic/e1k \ -
uspace/Makefile.common
r8c7d5ad ref521d4 258 258 259 259 ifeq ($(CONFIG_DEBUG),y) 260 GCC_CFLAGS += -Werror260 # GCC_CFLAGS += -Werror 261 261 ICC_CFLAGS += -Werror 262 262 endif
Note:
See TracChangeset
for help on using the changeset viewer.
