Merge "Reorganize directory structure"
diff --git a/lib/vbexport/boot_device.h b/include/boot_device.h
similarity index 100%
rename from lib/vbexport/boot_device.h
rename to include/boot_device.h
diff --git a/include/chromeos/boot_kernel.h b/include/boot_kernel.h
similarity index 100%
rename from include/chromeos/boot_kernel.h
rename to include/boot_kernel.h
diff --git a/include/chromeos/common.h b/include/common.h
similarity index 100%
rename from include/chromeos/common.h
rename to include/common.h
diff --git a/include/chromeos/cros_gpio.h b/include/cros_gpio.h
similarity index 100%
rename from include/chromeos/cros_gpio.h
rename to include/cros_gpio.h
diff --git a/include/chromeos/crossystem_data.h b/include/crossystem_data.h
similarity index 100%
rename from include/chromeos/crossystem_data.h
rename to include/crossystem_data.h
diff --git a/include/chromeos/fdt_decode.h b/include/fdt_decode.h
similarity index 100%
rename from include/chromeos/fdt_decode.h
rename to include/fdt_decode.h
diff --git a/include/chromeos/firmware_storage.h b/include/firmware_storage.h
similarity index 100%
rename from include/chromeos/firmware_storage.h
rename to include/firmware_storage.h
diff --git a/include/chromeos/fmap.h b/include/fmap.h
similarity index 100%
rename from include/chromeos/fmap.h
rename to include/fmap.h
diff --git a/include/chromeos/gbb.h b/include/gbb.h
similarity index 100%
rename from include/chromeos/gbb.h
rename to include/gbb.h
diff --git a/include/chromeos/hasher_state.h b/include/hasher_state.h
similarity index 100%
rename from include/chromeos/hasher_state.h
rename to include/hasher_state.h
diff --git a/include/chromeos/memory_wipe.h b/include/memory_wipe.h
similarity index 100%
rename from include/chromeos/memory_wipe.h
rename to include/memory_wipe.h
diff --git a/include/chromeos/power_management.h b/include/power_management.h
similarity index 100%
rename from include/chromeos/power_management.h
rename to include/power_management.h
diff --git a/lib/vbexport/boot_device.c b/lib/boot_device.c
similarity index 100%
rename from lib/vbexport/boot_device.c
rename to lib/boot_device.c
diff --git a/lib/vbexport/boot_device_ide.c b/lib/boot_device_ide.c
similarity index 100%
rename from lib/vbexport/boot_device_ide.c
rename to lib/boot_device_ide.c
diff --git a/lib/vbexport/boot_device_mmc.c b/lib/boot_device_mmc.c
similarity index 100%
rename from lib/vbexport/boot_device_mmc.c
rename to lib/boot_device_mmc.c
diff --git a/lib/vbexport/boot_device_scsi.c b/lib/boot_device_scsi.c
similarity index 100%
rename from lib/vbexport/boot_device_scsi.c
rename to lib/boot_device_scsi.c
diff --git a/lib/vbexport/boot_device_usb.c b/lib/boot_device_usb.c
similarity index 100%
rename from lib/vbexport/boot_device_usb.c
rename to lib/boot_device_usb.c
diff --git a/lib/chromeos/boot_kernel.c b/lib/boot_kernel.c
similarity index 100%
rename from lib/chromeos/boot_kernel.c
rename to lib/boot_kernel.c
diff --git a/lib/chromeos/crossystem_data.c b/lib/crossystem_data.c
similarity index 100%
rename from lib/chromeos/crossystem_data.c
rename to lib/crossystem_data.c
diff --git a/lib/vbexport/display.c b/lib/display.c
similarity index 100%
rename from lib/vbexport/display.c
rename to lib/display.c
diff --git a/lib/chromeos/fdt_decode.c b/lib/fdt_decode.c
similarity index 100%
rename from lib/chromeos/fdt_decode.c
rename to lib/fdt_decode.c
diff --git a/lib/chromeos/firmware_storage_spi.c b/lib/firmware_storage_spi.c
similarity index 100%
rename from lib/chromeos/firmware_storage_spi.c
rename to lib/firmware_storage_spi.c
diff --git a/lib/chromeos/firmware_storage_twostop.c b/lib/firmware_storage_twostop.c
similarity index 100%
rename from lib/chromeos/firmware_storage_twostop.c
rename to lib/firmware_storage_twostop.c
diff --git a/lib/chromeos/fmap.c b/lib/fmap.c
similarity index 100%
rename from lib/chromeos/fmap.c
rename to lib/fmap.c
diff --git a/lib/chromeos/gbb.c b/lib/gbb.c
similarity index 100%
rename from lib/chromeos/gbb.c
rename to lib/gbb.c
diff --git a/lib/vbexport/keyboard.c b/lib/keyboard.c
similarity index 100%
rename from lib/vbexport/keyboard.c
rename to lib/keyboard.c
diff --git a/lib/vbexport/load_firmware.c b/lib/load_firmware.c
similarity index 100%
rename from lib/vbexport/load_firmware.c
rename to lib/load_firmware.c
diff --git a/common/cmd_vboot_twostop.c b/lib/main.c
similarity index 100%
rename from common/cmd_vboot_twostop.c
rename to lib/main.c
diff --git a/lib/chromeos/memory_wipe.c b/lib/memory_wipe.c
similarity index 100%
rename from lib/chromeos/memory_wipe.c
rename to lib/memory_wipe.c
diff --git a/lib/vbexport/misc.c b/lib/misc.c
similarity index 100%
rename from lib/vbexport/misc.c
rename to lib/misc.c
diff --git a/lib/vbexport/tlcl_stub.c b/lib/tlcl_stub.c
similarity index 100%
rename from lib/vbexport/tlcl_stub.c
rename to lib/tlcl_stub.c
diff --git a/lib/vbexport/utility.c b/lib/utility.c
similarity index 100%
rename from lib/vbexport/utility.c
rename to lib/utility.c
diff --git a/board/chromebook-x86/chromeos/cros_gpio.c b/soc/coreboot/lib/cros_gpio.c
similarity index 100%
rename from board/chromebook-x86/chromeos/cros_gpio.c
rename to soc/coreboot/lib/cros_gpio.c
diff --git a/board/chromebook-x86/chromeos/eeprom_driver.c b/soc/coreboot/lib/eeprom_driver.c
similarity index 100%
rename from board/chromebook-x86/chromeos/eeprom_driver.c
rename to soc/coreboot/lib/eeprom_driver.c
diff --git a/board/chromebook-x86/vbexport/nvstorage.c b/soc/coreboot/lib/nvstorage.c
similarity index 100%
rename from board/chromebook-x86/vbexport/nvstorage.c
rename to soc/coreboot/lib/nvstorage.c
diff --git a/board/chromebook-x86/chromeos/power_management.c b/soc/coreboot/lib/power_management.c
similarity index 100%
rename from board/chromebook-x86/chromeos/power_management.c
rename to soc/coreboot/lib/power_management.c
diff --git a/board/chromebook-x86/vbexport/utility.c b/soc/coreboot/lib/utility.c
similarity index 100%
rename from board/chromebook-x86/vbexport/utility.c
rename to soc/coreboot/lib/utility.c
diff --git a/board/nvidia/chromeos/cros_gpio.c b/soc/tegra2/lib/cros_gpio.c
similarity index 100%
rename from board/nvidia/chromeos/cros_gpio.c
rename to soc/tegra2/lib/cros_gpio.c
diff --git a/board/nvidia/vbexport/nvstorage.c b/soc/tegra2/lib/nvstorage.c
similarity index 100%
rename from board/nvidia/vbexport/nvstorage.c
rename to soc/tegra2/lib/nvstorage.c
diff --git a/board/nvidia/chromeos/power_management.c b/soc/tegra2/lib/power_management.c
similarity index 100%
rename from board/nvidia/chromeos/power_management.c
rename to soc/tegra2/lib/power_management.c
diff --git a/board/nvidia/vbexport/utility.c b/soc/tegra2/lib/utility.c
similarity index 100%
rename from board/nvidia/vbexport/utility.c
rename to soc/tegra2/lib/utility.c
diff --git a/common/cmd_vbexport_test.c b/tests/test_vbexport.c
similarity index 100%
rename from common/cmd_vbexport_test.c
rename to tests/test_vbexport.c
diff --git a/common/cmd_vboot_test.c b/tests/test_vboot.c
similarity index 100%
rename from common/cmd_vboot_test.c
rename to tests/test_vboot.c